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

Side by Side Diff: chrome/browser/themes/theme_properties.h

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include missing browsertest .js file in chrome_tests.gypi Created 6 years, 2 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 (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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 COLOR_CONTROL_BACKGROUND = 1000, 81 COLOR_CONTROL_BACKGROUND = 1000,
82 COLOR_TOOLBAR_SEPARATOR, 82 COLOR_TOOLBAR_SEPARATOR,
83 83
84 // These colors don't have constant default values. They are derived from 84 // These colors don't have constant default values. They are derived from
85 // the runtime value of other colors. 85 // the runtime value of other colors.
86 COLOR_NTP_SECTION_HEADER_TEXT, 86 COLOR_NTP_SECTION_HEADER_TEXT,
87 COLOR_NTP_SECTION_HEADER_TEXT_HOVER, 87 COLOR_NTP_SECTION_HEADER_TEXT_HOVER,
88 COLOR_NTP_SECTION_HEADER_RULE, 88 COLOR_NTP_SECTION_HEADER_RULE,
89 COLOR_NTP_SECTION_HEADER_RULE_LIGHT, 89 COLOR_NTP_SECTION_HEADER_RULE_LIGHT,
90 COLOR_NTP_TEXT_LIGHT, 90 COLOR_NTP_TEXT_LIGHT,
91 #if defined(ENABLE_MANAGED_USERS)
91 COLOR_SUPERVISED_USER_LABEL, 92 COLOR_SUPERVISED_USER_LABEL,
92 COLOR_SUPERVISED_USER_LABEL_BACKGROUND, 93 COLOR_SUPERVISED_USER_LABEL_BACKGROUND,
93 COLOR_SUPERVISED_USER_LABEL_BORDER, 94 COLOR_SUPERVISED_USER_LABEL_BORDER,
95 #endif
94 96
95 COLOR_STATUS_BAR_TEXT, 97 COLOR_STATUS_BAR_TEXT,
96 98
97 #if defined(OS_MACOSX) 99 #if defined(OS_MACOSX)
98 COLOR_TOOLBAR_BEZEL, 100 COLOR_TOOLBAR_BEZEL,
99 COLOR_TOOLBAR_STROKE, 101 COLOR_TOOLBAR_STROKE,
100 COLOR_TOOLBAR_STROKE_INACTIVE, 102 COLOR_TOOLBAR_STROKE_INACTIVE,
101 COLOR_TOOLBAR_BUTTON_STROKE, 103 COLOR_TOOLBAR_BUTTON_STROKE,
102 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE, 104 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE,
103 GRADIENT_FRAME_INCOGNITO, 105 GRADIENT_FRAME_INCOGNITO,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 146
145 // Returns the default value for the given property |id|. Returns -1 if |id| 147 // Returns the default value for the given property |id|. Returns -1 if |id|
146 // is invalid. 148 // is invalid.
147 static int GetDefaultDisplayProperty(int id); 149 static int GetDefaultDisplayProperty(int id);
148 150
149 private: 151 private:
150 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); 152 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
151 }; 153 };
152 154
153 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ 155 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
OLDNEW
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_theme.h ('k') | chrome/browser/themes/theme_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698