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

Unified Diff: ash/common/system/tray/tray_popup_item_style.cc

Issue 2365523002: Materialized the font/icon color for some default rows in the system menu. (Closed)
Patch Set: Addressed tdanderson@ comments from previous patch set. Created 4 years, 3 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_popup_item_style.cc
diff --git a/ash/common/system/tray/tray_popup_item_style.cc b/ash/common/system/tray/tray_popup_item_style.cc
index fba33136a2241e1523b7a27a60de257d8c481f71..41536deda63c6d4a1eaa78b10570c46a07a52e96 100644
--- a/ash/common/system/tray/tray_popup_item_style.cc
+++ b/ash/common/system/tray/tray_popup_item_style.cc
@@ -4,7 +4,6 @@
#include "ash/common/system/tray/tray_popup_item_style.h"
-#include "ash/common/system/tray/tray_popup_item_style_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/font.h"
#include "ui/gfx/font_list.h"
@@ -28,30 +27,6 @@ TrayPopupItemStyle::TrayPopupItemStyle(const ui::NativeTheme* theme,
TrayPopupItemStyle::~TrayPopupItemStyle() {}
-void TrayPopupItemStyle::AddObserver(TrayPopupItemStyleObserver* observer) {
- if (!observers_.HasObserver(observer))
- observers_.AddObserver(observer);
-}
-
-void TrayPopupItemStyle::RemoveObserver(TrayPopupItemStyleObserver* observer) {
- observers_.RemoveObserver(observer);
-}
-
-void TrayPopupItemStyle::SetTheme(const ui::NativeTheme* theme) {
- theme_ = theme;
- NotifyObserversStyleUpdated();
-}
-
-void TrayPopupItemStyle::SetColorStyle(ColorStyle color_style) {
- color_style_ = color_style;
- NotifyObserversStyleUpdated();
-}
-
-void TrayPopupItemStyle::SetFontStyle(FontStyle font_style) {
- font_style_ = font_style;
- NotifyObserversStyleUpdated();
-}
-
SkColor TrayPopupItemStyle::GetForegroundColor() const {
switch (color_style_) {
case ColorStyle::ACTIVE:
@@ -97,9 +72,4 @@ void TrayPopupItemStyle::SetupLabel(views::Label* label) const {
}
}
-void TrayPopupItemStyle::NotifyObserversStyleUpdated() {
- FOR_EACH_OBSERVER(TrayPopupItemStyleObserver, observers_,
- OnTrayPopupItemStyleUpdated());
-}
-
} // namespace ash
« no previous file with comments | « ash/common/system/tray/tray_popup_item_style.h ('k') | ash/common/system/tray/tray_popup_item_style_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698