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

Unified Diff: ash/common/system/tray/tray_image_item.h

Issue 2700653002: [Ash MD] Remove pre-MD code from TrayImageItem and subclasses (Closed)
Patch Set: Created 3 years, 10 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
Index: ash/common/system/tray/tray_image_item.h
diff --git a/ash/common/system/tray/tray_image_item.h b/ash/common/system/tray/tray_image_item.h
index ad9aa9e0becd02154b6331d7bdd9687263d3b2ec..385c8cd36f524ce4573c6b6657f878e9689cfc3c 100644
--- a/ash/common/system/tray/tray_image_item.h
+++ b/ash/common/system/tray/tray_image_item.h
@@ -14,13 +14,19 @@ namespace views {
class ImageView;
}
+namespace gfx {
+struct VectorIcon;
+}
+
namespace ash {
class TrayItemView;
// A system tray item that uses an image as its "tray view" in the status area.
class ASH_EXPORT TrayImageItem : public SystemTrayItem {
public:
- TrayImageItem(SystemTray* system_tray, int resource_id, UmaType uma_type);
+ TrayImageItem(SystemTray* system_tray,
+ const gfx::VectorIcon& icon,
+ UmaType uma_type);
~TrayImageItem() override;
views::View* tray_view();
@@ -38,24 +44,15 @@ class ASH_EXPORT TrayImageItem : public SystemTrayItem {
void UpdateAfterLoginStatusChange(LoginStatus status) override;
void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
- // Sets the color of the material design icon to |color|.
+ // Sets the color of the icon to |color|.
void SetIconColor(SkColor color);
- // Changes the icon of the tray-view to the specified resource.
- // TODO(tdanderson): This is only used for non-material design, so remove it
- // when material design is the default. See crbug.com/625692.
- void SetImageFromResourceId(int resource_id);
-
private:
// Sets the current icon on |tray_view_|'s ImageView.
void UpdateImageOnImageView();
- // The resource ID for the non-material design icon in the tray.
- // TODO(tdanderson): This is only used for non-material design, so remove it
- // when material design is the default. See crbug.com/625692.
- int resource_id_;
-
- // The color of the material design icon in the tray.
+ // The icon and its current color.
+ const gfx::VectorIcon* icon_ = nullptr;
Evan Stade 2017/02/16 19:53:14 const ref (?)
tdanderson 2017/02/17 20:32:48 Done.
SkColor icon_color_;
// The image view in the tray.

Powered by Google App Engine
This is Rietveld 408576698