Use vector assets for media router icons.

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 "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

[apacible, 2016/07/13 22:30:19]

Can we remove resource_bundle.h?

+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/paint_vector_icon.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)),
-      media_router_active_icon_(
-          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-              IDR_MEDIA_ROUTER_ACTIVE_ICON)),
-      media_router_error_icon_(
-          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-              IDR_MEDIA_ROUTER_ERROR_ICON)),
-      media_router_idle_icon_(
-          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-              IDR_MEDIA_ROUTER_IDLE_ICON)),
-      media_router_warning_icon_(
-          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-              IDR_MEDIA_ROUTER_WARNING_ICON)),
-      current_icon_(&media_router_idle_icon_),
+      current_icon_(gfx::VectorIconId::MEDIA_ROUTER_IDLE),
       has_local_display_route_(false),
       delegate_(nullptr),
       browser_(browser),
       toolbar_actions_bar_(toolbar_actions_bar),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser),
       tab_strip_model_observer_(this),
       weak_ptr_factory_(this) {
   DCHECK(browser_);
   DCHECK(toolbar_actions_bar_);
@@ skipping 17 matching lines @@
   // WebContents ready.
   // In cases such as opening a new browser window, SetDelegate() will be
   // called before the WebContents is set. In those cases, we update the popup
   // state when ActiveTabChanged() is called.
   if (delegate_ && delegate_->GetCurrentWebContents())
     UpdatePopupState();
 }
 
 gfx::Image MediaRouterAction::GetIcon(content::WebContents* web_contents,
                                       const gfx::Size& size) {
-  return *current_icon_;
+  // Color is defined in the icon.
+  return gfx::Image(
+      gfx::CreateVectorIcon(current_icon_, gfx::kPlaceholderColor));
 }
 
 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 124 matching lines @@
   DCHECK(web_contents);
   return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
       web_contents);
 }
 
 MediaRouterActionPlatformDelegate* MediaRouterAction::GetPlatformDelegate() {
   return platform_delegate_.get();
 }
 
 void MediaRouterAction::MaybeUpdateIcon() {
-  const gfx::Image* new_icon = GetCurrentIcon();
+  gfx::VectorIconId new_icon = GetCurrentIcon();
 
   // Update the current state if it has changed.
   if (new_icon != current_icon_) {
     current_icon_ = new_icon;
 
     // Tell the associated view to update its icon to reflect the change made
     // above.
     if (delegate_)
       delegate_->UpdateState();
   }
 }
 
-const gfx::Image* MediaRouterAction::GetCurrentIcon() const {
+gfx::VectorIconId MediaRouterAction::GetCurrentIcon() const {
   // Highest priority is to indicate whether there's an issue.
   if (issue_) {
     if (issue_->severity() == media_router::Issue::FATAL)
-      return &media_router_error_icon_;
+      return gfx::VectorIconId::MEDIA_ROUTER_ERROR;
     if (issue_->severity() == media_router::Issue::WARNING)
-      return &media_router_warning_icon_;
+      return gfx::VectorIconId::MEDIA_ROUTER_WARNING;
   }
 
-  return has_local_display_route_ ? &media_router_active_icon_
-                                  : &media_router_idle_icon_;
+  return has_local_display_route_ ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
+                                  : gfx::VectorIconId::MEDIA_ROUTER_IDLE;
 }