Move more vector icons to more appropriate directories.

chrome/browser/ui/toolbar/media_router_action.cc

Index: chrome/browser/ui/toolbar/media_router_action.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action.cc b/chrome/browser/ui/toolbar/media_router_action.cc
index ed5d696910f9e5306c0fc770bb7bf4d4ddf58991..f2057fbd37b85fc80829a94aaa037d95ffdcd169 100644
--- a/chrome/browser/ui/toolbar/media_router_action.cc
+++ b/chrome/browser/ui/toolbar/media_router_action.cc
@@ -23,6 +23,8 @@
 #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;
 
@@ -39,7 +41,7 @@ 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),
@@ -61,20 +63,18 @@ 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 {
@@ -94,7 +94,7 @@ void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {
 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 {
@@ -261,11 +261,11 @@ MediaRouterActionPlatformDelegate* MediaRouterAction::GetPlatformDelegate() {
 }
 
 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
@@ -275,17 +275,17 @@ void MediaRouterAction::MaybeUpdateIcon() {
   }
 }
 
-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;
 }