| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE, | 148 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE, |
| 149 GRADIENT_FRAME_INCOGNITO, | 149 GRADIENT_FRAME_INCOGNITO, |
| 150 GRADIENT_FRAME_INCOGNITO_INACTIVE, | 150 GRADIENT_FRAME_INCOGNITO_INACTIVE, |
| 151 GRADIENT_TOOLBAR, | 151 GRADIENT_TOOLBAR, |
| 152 GRADIENT_TOOLBAR_INACTIVE, | 152 GRADIENT_TOOLBAR_INACTIVE, |
| 153 GRADIENT_TOOLBAR_BUTTON, | 153 GRADIENT_TOOLBAR_BUTTON, |
| 154 GRADIENT_TOOLBAR_BUTTON_INACTIVE, | 154 GRADIENT_TOOLBAR_BUTTON_INACTIVE, |
| 155 GRADIENT_TOOLBAR_BUTTON_PRESSED, | 155 GRADIENT_TOOLBAR_BUTTON_PRESSED, |
| 156 GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE, | 156 GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE, |
| 157 #endif // OS_MACOSX | 157 #endif // OS_MACOSX |
| 158 |
| 159 #if defined(OS_WIN) |
| 160 // The color of the 1px border around the window on Windows 10. |
| 161 COLOR_ACCENT_BORDER, |
| 162 #endif // OS_WIN |
| 158 }; | 163 }; |
| 159 | 164 |
| 160 // Used by the browser theme pack to parse alignments from something like | 165 // Used by the browser theme pack to parse alignments from something like |
| 161 // "top left" into a bitmask of Alignment. | 166 // "top left" into a bitmask of Alignment. |
| 162 static int StringToAlignment(const std::string& alignment); | 167 static int StringToAlignment(const std::string& alignment); |
| 163 | 168 |
| 164 // Used by the browser theme pack to parse alignments from something like | 169 // Used by the browser theme pack to parse alignments from something like |
| 165 // "no-repeat" into a Tiling value. | 170 // "no-repeat" into a Tiling value. |
| 166 static int StringToTiling(const std::string& tiling); | 171 static int StringToTiling(const std::string& tiling); |
| 167 | 172 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 179 | 184 |
| 180 // Returns the default color for the given color |id| COLOR_* enum value. | 185 // Returns the default color for the given color |id| COLOR_* enum value. |
| 181 // Returns gfx::kPlaceholderColor if |id| is invalid. | 186 // Returns gfx::kPlaceholderColor if |id| is invalid. |
| 182 static SkColor GetDefaultColor(int id, bool otr); | 187 static SkColor GetDefaultColor(int id, bool otr); |
| 183 | 188 |
| 184 private: | 189 private: |
| 185 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); | 190 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); |
| 186 }; | 191 }; |
| 187 | 192 |
| 188 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ | 193 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ |
| OLD | NEW |