Chromium Code Reviews| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 COLOR_TOOLBAR_STROKE_INACTIVE, | 104 COLOR_TOOLBAR_STROKE_INACTIVE, |
| 105 COLOR_TOOLBAR_BUTTON_STROKE, | 105 COLOR_TOOLBAR_BUTTON_STROKE, |
| 106 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE, | 106 COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE, |
| 107 GRADIENT_FRAME_INCOGNITO, | 107 GRADIENT_FRAME_INCOGNITO, |
| 108 GRADIENT_FRAME_INCOGNITO_INACTIVE, | 108 GRADIENT_FRAME_INCOGNITO_INACTIVE, |
| 109 GRADIENT_TOOLBAR, | 109 GRADIENT_TOOLBAR, |
| 110 GRADIENT_TOOLBAR_INACTIVE, | 110 GRADIENT_TOOLBAR_INACTIVE, |
| 111 GRADIENT_TOOLBAR_BUTTON, | 111 GRADIENT_TOOLBAR_BUTTON, |
| 112 GRADIENT_TOOLBAR_BUTTON_INACTIVE, | 112 GRADIENT_TOOLBAR_BUTTON_INACTIVE, |
| 113 GRADIENT_TOOLBAR_BUTTON_PRESSED, | 113 GRADIENT_TOOLBAR_BUTTON_PRESSED, |
| 114 GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE | 114 GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE, |
| 115 #endif // OS_MACOSX | 115 #endif // OS_MACOSX |
| 116 | |
| 117 // TODO(jonross): Upon the completion of Material Design work, evaluate | |
| 118 // which of these properties can be moved out of ThemeProperties. | |
|
pkotwicz
2015/07/03 18:45:21
Nit: Can you please add a new line?
jonross
2015/07/03 18:55:08
Done.
| |
| 119 // Layout Properties for the Toolbar | |
| 120 PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING, | |
| 121 PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING, | |
| 122 PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH, | |
| 123 PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT, | |
| 116 }; | 124 }; |
| 117 | 125 |
| 118 // Used by the browser theme pack to parse alignments from something like | 126 // Used by the browser theme pack to parse alignments from something like |
| 119 // "top left" into a bitmask of Alignment. | 127 // "top left" into a bitmask of Alignment. |
| 120 static int StringToAlignment(const std::string& alignment); | 128 static int StringToAlignment(const std::string& alignment); |
| 121 | 129 |
| 122 // Used by the browser theme pack to parse alignments from something like | 130 // Used by the browser theme pack to parse alignments from something like |
| 123 // "no-repeat" into a Tiling value. | 131 // "no-repeat" into a Tiling value. |
| 124 static int StringToTiling(const std::string& tiling); | 132 static int StringToTiling(const std::string& tiling); |
| 125 | 133 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 145 | 153 |
| 146 // Returns the default value for the given property |id|. Returns -1 if |id| | 154 // Returns the default value for the given property |id|. Returns -1 if |id| |
| 147 // is invalid. | 155 // is invalid. |
| 148 static int GetDefaultDisplayProperty(int id); | 156 static int GetDefaultDisplayProperty(int id); |
| 149 | 157 |
| 150 private: | 158 private: |
| 151 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); | 159 DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties); |
| 152 }; | 160 }; |
| 153 | 161 |
| 154 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ | 162 #endif // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_ |
| OLD | NEW |