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

Side by Side Diff: ash/common/system/tray/tray_popup_item_style.h

Issue 2496963004: [ash-md] Fixed the effective text/icon colors in the system menu. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void set_theme(const ui::NativeTheme* theme) { theme_ = theme; } 77 void set_theme(const ui::NativeTheme* theme) { theme_ = theme; }
78 78
79 ColorStyle color_style() const { return color_style_; } 79 ColorStyle color_style() const { return color_style_; }
80 80
81 void set_color_style(ColorStyle color_style) { color_style_ = color_style; } 81 void set_color_style(ColorStyle color_style) { color_style_ = color_style; }
82 82
83 FontStyle font_style() const { return font_style_; } 83 FontStyle font_style() const { return font_style_; }
84 84
85 void set_font_style(FontStyle font_style) { font_style_ = font_style; } 85 void set_font_style(FontStyle font_style) { font_style_ = font_style; }
86 86
87 SkColor GetForegroundColor() const; 87 SkColor GetLTextColor() const;
tdanderson 2016/11/12 03:17:10 nit: GetTextColor (remove the L)
88
89 SkColor GetIconColor() const;
88 90
89 // Configures a Label as per the style (e.g. color, font). 91 // Configures a Label as per the style (e.g. color, font).
90 void SetupLabel(views::Label* label) const; 92 void SetupLabel(views::Label* label) const;
91 93
92 private: 94 private:
93 // The theme that the styles are dervied from. 95 // The theme that the styles are dervied from.
94 const ui::NativeTheme* theme_; 96 const ui::NativeTheme* theme_;
95 97
96 FontStyle font_style_; 98 FontStyle font_style_;
97 99
98 ColorStyle color_style_; 100 ColorStyle color_style_;
99 101
100 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle); 102 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle);
101 }; 103 };
102 104
103 } // namespace ash 105 } // namespace ash
104 106
105 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 107 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/tray/tray_popup_item_style.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698