Move more vector icons to more appropriate directories.

chrome/browser/ui/toolbar/media_router_action.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_router_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icon_types.h"
+#include "ui/vector_icons/vector_icons.h"
 
 using media_router::MediaRouterDialogControllerImpl;
 
 namespace {
 
 media_router::MediaRouter* GetMediaRouter(Browser* browser) {
   return media_router::MediaRouterFactory::GetApiForBrowserContext(
       browser->profile());
 }
 
 }  // namespace
 
 MediaRouterAction::MediaRouterAction(Browser* browser,
                                      ToolbarActionsBar* toolbar_actions_bar)
     : media_router::IssuesObserver(GetMediaRouter(browser)),
       media_router::MediaRoutesObserver(GetMediaRouter(browser)),
-      current_icon_(gfx::VectorIconId::MEDIA_ROUTER_IDLE),
+      current_icon_(&ui::kMediaRouterIdleIcon),
       has_local_display_route_(false),
       has_dialog_(false),
       delegate_(nullptr),
       browser_(browser),
       toolbar_actions_bar_(toolbar_actions_bar),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser),
       tab_strip_model_observer_(this),
       toolbar_actions_bar_observer_(this),
       weak_ptr_factory_(this) {
   DCHECK(browser_);
   DCHECK(toolbar_actions_bar_);
   tab_strip_model_observer_.Add(browser_->tab_strip_model());
   toolbar_actions_bar_observer_.Add(toolbar_actions_bar_);
   IssuesObserver::Init();
 }
 
 MediaRouterAction::~MediaRouterAction() {
 }
 
 // static
-SkColor MediaRouterAction::GetIconColor(gfx::VectorIconId icon_id) {
-  switch (icon_id) {
-    case gfx::VectorIconId::MEDIA_ROUTER_IDLE:
-      return gfx::kChromeIconGrey;
-    case gfx::VectorIconId::MEDIA_ROUTER_ACTIVE:
-      return gfx::kGoogleBlue500;
-    case gfx::VectorIconId::MEDIA_ROUTER_WARNING:
-      return gfx::kGoogleYellow700;
-    case gfx::VectorIconId::MEDIA_ROUTER_ERROR:
-      return gfx::kGoogleRed700;
-    default:
-      NOTREACHED();
-      return gfx::kPlaceholderColor;
-  }
+SkColor MediaRouterAction::GetIconColor(const gfx::VectorIcon& icon_id) {
+  if (&icon_id == &ui::kMediaRouterIdleIcon)
+    return gfx::kChromeIconGrey;
+  else if (&icon_id == &ui::kMediaRouterActiveIcon)
+    return gfx::kGoogleBlue500;
+  else if (&icon_id == &ui::kMediaRouterWarningIcon)
+    return gfx::kGoogleYellow700;
+  else if (&icon_id == &ui::kMediaRouterErrorIcon)
+    return gfx::kGoogleRed700;
+
+  NOTREACHED();
+  return gfx::kPlaceholderColor;
 }
 
 std::string MediaRouterAction::GetId() const {
   return ComponentToolbarActionsFactory::kMediaRouterActionId;
 }
 
 void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {
   delegate_ = delegate;
 
   // In cases such as opening a new browser window, SetDelegate() will be
   // called before the WebContents is set. In those cases, we register with the
   // dialog controller when ActiveTabChanged() is called.
   if (delegate_ && delegate_->GetCurrentWebContents())
     RegisterWithDialogController();
 }
 
 gfx::Image MediaRouterAction::GetIcon(content::WebContents* web_contents,
                                       const gfx::Size& size) {
   return gfx::Image(
-      gfx::CreateVectorIcon(current_icon_, GetIconColor(current_icon_)));
+      gfx::CreateVectorIcon(*current_icon_, GetIconColor(*current_icon_)));
 }
 
 base::string16 MediaRouterAction::GetActionName() const {
   return l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE);
 }
 
 base::string16 MediaRouterAction::GetAccessibleName(
     content::WebContents* web_contents) const {
   return GetTooltip(web_contents);
 }
@@ skipping 146 matching lines @@
   DCHECK(web_contents);
   return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
       web_contents);
 }
 
 MediaRouterActionPlatformDelegate* MediaRouterAction::GetPlatformDelegate() {
   return platform_delegate_.get();
 }
 
 void MediaRouterAction::MaybeUpdateIcon() {
-  gfx::VectorIconId new_icon = GetCurrentIcon();
+  const gfx::VectorIcon& new_icon = GetCurrentIcon();
 
   // Update the current state if it has changed.
-  if (new_icon != current_icon_) {
-    current_icon_ = new_icon;
+  if (&new_icon != current_icon_) {
+    current_icon_ = &new_icon;
 
     // Tell the associated view to update its icon to reflect the change made
     // above. If MaybeUpdateIcon() was called as a result of instantiating
     // |this|, then |delegate_| may not be set yet.
     if (delegate_)
       UpdateState();
   }
 }
 
-gfx::VectorIconId MediaRouterAction::GetCurrentIcon() const {
+const gfx::VectorIcon& MediaRouterAction::GetCurrentIcon() const {
   // Highest priority is to indicate whether there's an issue.
   if (current_issue_) {
     media_router::IssueInfo::Severity severity = current_issue_->severity;
     if (severity == media_router::IssueInfo::Severity::FATAL)
-      return gfx::VectorIconId::MEDIA_ROUTER_ERROR;
+      return ui::kMediaRouterErrorIcon;
     if (severity == media_router::IssueInfo::Severity::WARNING)
-      return gfx::VectorIconId::MEDIA_ROUTER_WARNING;
+      return ui::kMediaRouterWarningIcon;
     // Fall through for Severity::NOTIFICATION.
   }
 
-  return has_local_display_route_ ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
-                                  : gfx::VectorIconId::MEDIA_ROUTER_IDLE;
+  return has_local_display_route_ ? ui::kMediaRouterActiveIcon
+                                  : ui::kMediaRouterIdleIcon;
 }