Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3967)

Unified Diff: chrome/browser/ui/toolbar/media_router_action.h

Issue 2143863004: Use vector assets for media router icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: init to zero Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/media_router_action.h
diff --git a/chrome/browser/ui/toolbar/media_router_action.h b/chrome/browser/ui/toolbar/media_router_action.h
index 4efff0e54cb3e30a8b0b14916f7488781432e4f4..ace06a32f18e0cdfe7f86ea861e907c9cdadf917 100644
--- a/chrome/browser/ui/toolbar/media_router_action.h
+++ b/chrome/browser/ui/toolbar/media_router_action.h
@@ -13,6 +13,7 @@
#include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
+#include "ui/gfx/vector_icons_public.h"
class Browser;
class MediaRouterActionPlatformDelegate;
@@ -91,22 +92,11 @@ class MediaRouterAction : public ToolbarActionViewController,
// updates |current_icon_|.
void MaybeUpdateIcon();
- const gfx::Image* GetCurrentIcon() const;
-
- // Cached icons.
- // Indicates that the current Chrome profile is using at least one device.
- const gfx::Image media_router_active_icon_;
- // Indicates a failure, e.g. session launch failure.
- const gfx::Image media_router_error_icon_;
- // Indicates that the current Chrome profile is not using any devices.
- // Devices may or may not be available.
- const gfx::Image media_router_idle_icon_;
- // Indicates there is a warning message.
- const gfx::Image media_router_warning_icon_;
+ gfx::VectorIconId GetCurrentIcon() const;
// The current icon to show. This is updated based on the current issues and
// routes since |this| is an IssueObserver and MediaRoutesObserver.
- const gfx::Image* current_icon_;
+ gfx::VectorIconId current_icon_;
// The current issue shown in the Media Router WebUI. Can be null. It is set
// in OnIssueUpdated(), which is called by the IssueManager.
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/ui/toolbar/media_router_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698