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

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

Issue 2244003002: Materialized font style for TrayItemMore type system tray rows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated TrayPopupItemStyle to use the default FontList. 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.h
diff --git a/ash/common/system/tray/tray_popup_item_style.h b/ash/common/system/tray/tray_popup_item_style.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8cc4b070be134e4f35d6eda68630f430df934d2
--- /dev/null
+++ b/ash/common/system/tray/tray_popup_item_style.h
@@ -0,0 +1,88 @@
+// Copyright 2016 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.
+
+#ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
+#define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
+
+#include "base/observer_list.h"
+#include "third_party/skia/include/core/SkColor.h"
+
+namespace ui {
+class NativeTheme;
+} // namespace ui
+
+namespace views {
+class Label;
+} // namespace views
+
+namespace ash {
+class TrayPopupItemStyleObserver;
+
+// Central style provider for the system tray popup items. Makes it easier to
tdanderson 2016/09/12 18:51:47 I'd prefer "rows", "system menu rows", or just "th
bruthig 2016/09/15 18:56:30 Done. Let's discuss alternatives offline.
tdanderson 2016/09/15 19:49:33 Acknowledged.
+// ensure all visuals are consistent and easily updated in one spot instead of
+// being defined in multiple places throughout the code.
+class TrayPopupItemStyle {
+ public:
+ // The different visual styles that a row can have.
+ enum class ColorStyle {
+ // Active and clickable
tdanderson 2016/09/12 18:51:47 nit: . at end of comments
bruthig 2016/09/15 18:56:30 Done.
+ ACTIVE,
+ // Inactive but clickable
+ INACTIVE,
+ // Disabled and not clickable
+ DISABLED,
+ };
+
+ // The different font styles that a row can have.
+ enum class FontStyle {
tdanderson 2016/09/12 18:51:47 I'm having a hard time trying to figure out what a
bruthig 2016/09/15 18:56:30 FTR I took this from the "System menu typography"
tdanderson 2016/09/15 19:49:33 lg
+ TITLE,
+ MAIN_PANEL_SECTION_ROW,
+ SUB_PANEL_SECTION_ROW,
+ SYSTEM_INFO,
+ CAPTION,
+ BUTTON,
+ };
+
+ TrayPopupItemStyle(const ui::NativeTheme* theme, FontStyle font_style);
+ virtual ~TrayPopupItemStyle();
tdanderson 2016/09/12 18:51:47 should this actually be virtual?
bruthig 2016/09/15 18:56:30 Removed.
+
+ 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);
+
+ ColorStyle color_style() const { return color_style_; }
+
+ // Sets the |color_style_| and notifies observers if |color_style_| changed.
+ void SetColorStyle(ColorStyle color_style);
+
+ FontStyle font_style() const { return font_style_; }
+
+ // Sets the |font_style_| notifies observers if |font_style_| changed.
+ void SetFontStyle(FontStyle font_style);
+
+ SkColor GetForegroundColor() const;
+
+ // Configures a Label as per the style (e.g. color, font).
+ void SetupLabel(views::Label* label) const;
+
+ private:
+ void NotifyObserversStyleUpdated();
+
+ // The theme that the styles are dervied from.
+ const ui::NativeTheme* theme_;
+
+ FontStyle font_style_;
+
+ ColorStyle color_style_;
+
+ base::ObserverList<TrayPopupItemStyleObserver> observers_;
+};
+
+} // namespace ash
+
+#endif // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_

Powered by Google App Engine
This is Rietveld 408576698