OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ | 5 #ifndef CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ |
6 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ | 6 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
118 COLOR_NTP_SECTION_HEADER_TEXT_HOVER, | 118 COLOR_NTP_SECTION_HEADER_TEXT_HOVER, |
119 COLOR_NTP_SECTION_HEADER_RULE, | 119 COLOR_NTP_SECTION_HEADER_RULE, |
120 COLOR_NTP_SECTION_HEADER_RULE_LIGHT, | 120 COLOR_NTP_SECTION_HEADER_RULE_LIGHT, |
121 COLOR_NTP_TEXT_LIGHT, | 121 COLOR_NTP_TEXT_LIGHT, |
122 #if defined(ENABLE_SUPERVISED_USERS) | 122 #if defined(ENABLE_SUPERVISED_USERS) |
123 COLOR_SUPERVISED_USER_LABEL, | 123 COLOR_SUPERVISED_USER_LABEL, |
124 COLOR_SUPERVISED_USER_LABEL_BACKGROUND, | 124 COLOR_SUPERVISED_USER_LABEL_BACKGROUND, |
125 COLOR_SUPERVISED_USER_LABEL_BORDER, | 125 COLOR_SUPERVISED_USER_LABEL_BORDER, |
126 #endif | 126 #endif |
127 | 127 |
128 COLOR_STATUS_BAR_TEXT, | |
Peter Kasting
2016/03/04 01:40:41
Ignore this change; this slipped in erroneously an
| |
129 | |
130 #if defined(OS_MACOSX) | 128 #if defined(OS_MACOSX) |
131 COLOR_FRAME_VIBRANCY_OVERLAY, | 129 COLOR_FRAME_VIBRANCY_OVERLAY, |
132 COLOR_TOOLBAR_INACTIVE, | 130 COLOR_TOOLBAR_INACTIVE, |
133 COLOR_BACKGROUND_TAB_INACTIVE, | 131 COLOR_BACKGROUND_TAB_INACTIVE, |
134 COLOR_TOOLBAR_BEZEL, | 132 COLOR_TOOLBAR_BEZEL, |
135 COLOR_TOOLBAR_STROKE, | 133 COLOR_TOOLBAR_STROKE, |
136 COLOR_TOOLBAR_STROKE_INACTIVE, | 134 COLOR_TOOLBAR_STROKE_INACTIVE, |
137 COLOR_TOOLBAR_STROKE_THEME, | 135 COLOR_TOOLBAR_STROKE_THEME, |
138 COLOR_TOOLBAR_STROKE_THEME_INACTIVE, | 136 COLOR_TOOLBAR_STROKE_THEME_INACTIVE, |
139 // The color of a toolbar button's border. | 137 // The color of a toolbar button's border. |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
176 | 174 |
177 // Returns the default color for the given color |id| COLOR_* enum value. | 175 // Returns the default color for the given color |id| COLOR_* enum value. |
178 // Returns gfx::kPlaceholderColor if |id| is invalid. | 176 // Returns gfx::kPlaceholderColor if |id| is invalid. |
179 static SkColor GetDefaultColor(int id, bool otr); | 177 static SkColor GetDefaultColor(int id, bool otr); |
180 | 178 |
181 private: | 179 private: |
182 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); | 180 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); |
183 }; | 181 }; |
184 | 182 |
185 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ | 183 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ |
OLD | NEW |