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

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

Issue 2978363002: Revert of Add a row in the network tray to inform users to turn Bluetooth on to enable Tether. (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « ash/system/tray/tray_info_label_unittest.cc ('k') | ash/system/tray/tray_popup_item_style.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
37 TITLE, 37 TITLE,
38 // Main text used by default view rows. 38 // Main text used by default view rows.
39 DEFAULT_VIEW_LABEL, 39 DEFAULT_VIEW_LABEL,
40 // Text in sub-section header rows in detailed views. 40 // Text in sub-section header rows in detailed views.
41 SUB_HEADER, 41 SUB_HEADER,
42 // Main text used by detailed view rows. 42 // Main text used by detailed view rows.
43 DETAILED_VIEW_LABEL, 43 DETAILED_VIEW_LABEL,
44 // System information text (e.g. date/time, battery status, "Scanning for 44 // System information text (e.g. date/time, battery status, "Scanning for
45 // devices..." seen in the Bluetooth detailed view, etc). 45 // devices..." seen in the Bluetooth detailed view, etc).
46 SYSTEM_INFO, 46 SYSTEM_INFO,
47 // System information text within a clickable row.
48 CLICKABLE_SYSTEM_INFO,
49 // Child buttons within rows that have a visible border (e.g. Cast's 47 // Child buttons within rows that have a visible border (e.g. Cast's
50 // "Stop", etc). 48 // "Stop", etc).
51 BUTTON, 49 BUTTON,
52 // Sub text within a row (e.g. user name in user row). 50 // Sub text within a row (e.g. user name in user row).
53 CAPTION, 51 CAPTION,
54 }; 52 };
55 53
56 static constexpr double kInactiveIconAlpha = 0.54; 54 static constexpr double kInactiveIconAlpha = 0.54;
57 55
58 static SkColor GetIconColor(ColorStyle color_style); 56 static SkColor GetIconColor(ColorStyle color_style);
(...skipping 20 matching lines...) Expand all
79 FontStyle font_style_; 77 FontStyle font_style_;
80 78
81 ColorStyle color_style_; 79 ColorStyle color_style_;
82 80
83 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle); 81 DISALLOW_COPY_AND_ASSIGN(TrayPopupItemStyle);
84 }; 82 };
85 83
86 } // namespace ash 84 } // namespace ash
87 85
88 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_ 86 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_ITEM_STYLE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_info_label_unittest.cc ('k') | ash/system/tray/tray_popup_item_style.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698