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

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

Issue 2817223003: Chrome OS: adjust wifi icons. (Closed)
Patch Set: Created 3 years, 8 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 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_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
6 #define ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 6 #define ASH_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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 DETAILED_VIEW_LABEL, 43 DETAILED_VIEW_LABEL,
44 // System information text (e.g. date/time, battery status, etc). 44 // System information text (e.g. date/time, battery status, etc).
45 SYSTEM_INFO, 45 SYSTEM_INFO,
46 // Child buttons within rows that have a visible border (e.g. Cast's 46 // Child buttons within rows that have a visible border (e.g. Cast's
47 // "Stop", etc). 47 // "Stop", etc).
48 BUTTON, 48 BUTTON,
49 // Sub text within a row (e.g. user name in user row). 49 // Sub text within a row (e.g. user name in user row).
50 CAPTION, 50 CAPTION,
51 }; 51 };
52 52
53 static constexpr double kInactiveIconAlpha = 0.54;
54
53 static SkColor GetIconColor(ColorStyle color_style); 55 static SkColor GetIconColor(ColorStyle color_style);
54 56
55 explicit TrayPopupItemStyle(FontStyle font_style); 57 explicit TrayPopupItemStyle(FontStyle font_style);
56 ~TrayPopupItemStyle(); 58 ~TrayPopupItemStyle();
57 59
58 ColorStyle color_style() const { return color_style_; } 60 ColorStyle color_style() const { return color_style_; }
59 61
60 void set_color_style(ColorStyle color_style) { color_style_ = color_style; } 62 void set_color_style(ColorStyle color_style) { color_style_ = color_style; }
61 63
62 FontStyle font_style() const { return font_style_; } 64 FontStyle font_style() const { return font_style_; }
(...skipping 11 matching lines...) Expand all
74 FontStyle font_style_; 76 FontStyle font_style_;
75 77
76 ColorStyle color_style_; 78 ColorStyle color_style_;
77 79
78 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle); 80 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle);
79 }; 81 };
80 82
81 } // namespace ash 83 } // namespace ash
82 84
83 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 85 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698