| Index: ash/common/system/tray/tray_popup_item_style.h
|
| diff --git a/ash/common/system/tray/tray_popup_item_style.h b/ash/common/system/tray/tray_popup_item_style.h
|
| index 1b4a0106cfe4449bba3fb158d00f90a46b1d099b..2767d52482e79623d624abf0ad56c904a4c79e8f 100644
|
| --- a/ash/common/system/tray/tray_popup_item_style.h
|
| +++ b/ash/common/system/tray/tray_popup_item_style.h
|
| @@ -6,7 +6,6 @@
|
| #define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
|
|
|
| #include "base/macros.h"
|
| -#include "base/observer_list.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
|
|
| namespace ui {
|
| @@ -18,7 +17,6 @@ class Label;
|
| } // namespace views
|
|
|
| namespace ash {
|
| -class TrayPopupItemStyleObserver;
|
|
|
| // Central style provider for the system tray menu. Makes it easier to ensure
|
| // all visuals are consistent and easily updated in one spot instead of being
|
| @@ -55,23 +53,17 @@ class TrayPopupItemStyle {
|
| TrayPopupItemStyle(const ui::NativeTheme* theme, FontStyle font_style);
|
| ~TrayPopupItemStyle();
|
|
|
| - void AddObserver(TrayPopupItemStyleObserver* observer);
|
| - void RemoveObserver(TrayPopupItemStyleObserver* observer);
|
| -
|
| const ui::NativeTheme* theme() const { return theme_; }
|
|
|
| - // Sets the |theme_| and notifies observers.
|
| - void SetTheme(const ui::NativeTheme* theme);
|
| + void set_theme(const ui::NativeTheme* theme) { theme_ = theme; }
|
|
|
| ColorStyle color_style() const { return color_style_; }
|
|
|
| - // Sets the |color_style_| and notifies observers if |color_style_| changed.
|
| - void SetColorStyle(ColorStyle color_style);
|
| + void set_color_style(ColorStyle color_style) { color_style_ = color_style; }
|
|
|
| FontStyle font_style() const { return font_style_; }
|
|
|
| - // Sets the |font_style_| notifies observers if |font_style_| changed.
|
| - void SetFontStyle(FontStyle font_style);
|
| + void set_font_style(FontStyle font_style) { font_style_ = font_style; }
|
|
|
| SkColor GetForegroundColor() const;
|
|
|
| @@ -79,8 +71,6 @@ class TrayPopupItemStyle {
|
| void SetupLabel(views::Label* label) const;
|
|
|
| private:
|
| - void NotifyObserversStyleUpdated();
|
| -
|
| // The theme that the styles are dervied from.
|
| const ui::NativeTheme* theme_;
|
|
|
| @@ -88,8 +78,6 @@ class TrayPopupItemStyle {
|
|
|
| ColorStyle color_style_;
|
|
|
| - base::ObserverList<TrayPopupItemStyleObserver> observers_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle);
|
| };
|
|
|
|
|