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

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

Issue 2456783005: [ash-md] Changed the style of ink drop applied to system menu icon buttons. (Closed)
Patch Set: Addressed review comments. 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
« no previous file with comments | « ash/common/system/tray/system_menu_button.cc ('k') | ash/common/system/tray/tray_constants.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CONSTANTS_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 typedef unsigned int SkColor; 10 typedef unsigned int SkColor;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 extern const int kMenuIconSize; 94 extern const int kMenuIconSize;
95 extern const SkColor kMenuIconColor; 95 extern const SkColor kMenuIconColor;
96 extern const SkColor kMenuIconColorDisabled; 96 extern const SkColor kMenuIconColorDisabled;
97 // The size of buttons in the system menu. 97 // The size of buttons in the system menu.
98 extern const int kMenuButtonSize; 98 extern const int kMenuButtonSize;
99 // The vertical padding for the system menu separator. 99 // The vertical padding for the system menu separator.
100 extern const int kMenuSeparatorVerticalPadding; 100 extern const int kMenuSeparatorVerticalPadding;
101 // The horizontal padding for the system menu separator. 101 // The horizontal padding for the system menu separator.
102 extern const int kMenuExtraMarginFromLeftEdge; 102 extern const int kMenuExtraMarginFromLeftEdge;
103 103
104 // The base color used for all ink drops in the system menu.
105 extern const SkColor kTrayPopupInkDropBaseColor;
106
107 // The opacity of the ink drop ripples for all ink drops in the system menu.
108 extern const float kTrayPopupInkDropRippleOpacity;
109
110 // The opacity of the ink drop ripples for all ink highlights in the system
111 // menu.
112 extern const float kTrayPopupInkDropHighlightOpacity;
113
114 // The inset applied to clickable surfaces in the system menu that do not have
115 // the ink drop filling the entire bounds.
116 extern const int kTrayPopupInkDropInset;
117
104 enum TrayConstant { 118 enum TrayConstant {
105 // A legacy height value used in non-MD calculations for applying additional 119 // A legacy height value used in non-MD calculations for applying additional
106 // borders on tray items. 120 // borders on tray items.
107 TRAY_ITEM_HEIGHT_LEGACY, 121 TRAY_ITEM_HEIGHT_LEGACY,
108 122
109 // Padding between items in the status tray area. 123 // Padding between items in the status tray area.
110 TRAY_SPACING, 124 TRAY_SPACING,
111 125
112 // Padding between the edge of shelf and the item in status tray area. 126 // Padding between the edge of shelf and the item in status tray area.
113 TRAY_PADDING_FROM_EDGE_OF_SHELF, 127 TRAY_PADDING_FROM_EDGE_OF_SHELF,
(...skipping 29 matching lines...) Expand all
143 int GetTrayConstant(TrayConstant constant); 157 int GetTrayConstant(TrayConstant constant);
144 158
145 namespace test { 159 namespace test {
146 const int kSettingsTrayItemViewId = 10000; 160 const int kSettingsTrayItemViewId = 10000;
147 const int kAccessibilityTrayItemViewId = 10001; 161 const int kAccessibilityTrayItemViewId = 10001;
148 } // namespace test 162 } // namespace test
149 163
150 } // namespace ash 164 } // namespace ash
151 165
152 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 166 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_menu_button.cc ('k') | ash/common/system/tray/tray_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698