OLD | NEW |
---|---|
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 UI_NATIVE_THEME_NATIVE_THEME_H_ | 5 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_ |
6 #define UI_NATIVE_THEME_NATIVE_THEME_H_ | 6 #define UI_NATIVE_THEME_NATIVE_THEME_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/observer_list.h" | 9 #include "base/observer_list.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 | 125 |
126 struct MenuCheckExtraParams { | 126 struct MenuCheckExtraParams { |
127 bool is_radio; | 127 bool is_radio; |
128 // Used for the disabled state to indicate if the item is both disabled and | 128 // Used for the disabled state to indicate if the item is both disabled and |
129 // selected. | 129 // selected. |
130 bool is_selected; | 130 bool is_selected; |
131 }; | 131 }; |
132 | 132 |
133 struct MenuItemExtraParams { | 133 struct MenuItemExtraParams { |
134 bool is_selected; | 134 bool is_selected; |
135 int corner_radius; | |
135 }; | 136 }; |
136 | 137 |
137 struct MenuListExtraParams { | 138 struct MenuListExtraParams { |
138 bool has_border; | 139 bool has_border; |
139 bool has_border_radius; | 140 bool has_border_radius; |
140 int arrow_x; | 141 int arrow_x; |
141 int arrow_y; | 142 int arrow_y; |
142 int arrow_size; | 143 int arrow_size; |
143 SkColor arrow_color; | 144 SkColor arrow_color; |
144 SkColor background_color; | 145 SkColor background_color; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
190 bool draw_edges; | 191 bool draw_edges; |
191 int classic_state; // Used on Windows when uxtheme is not available. | 192 int classic_state; // Used on Windows when uxtheme is not available. |
192 }; | 193 }; |
193 | 194 |
194 struct TrackbarExtraParams { | 195 struct TrackbarExtraParams { |
195 bool vertical; | 196 bool vertical; |
196 int classic_state; // Used on Windows when uxtheme is not available. | 197 int classic_state; // Used on Windows when uxtheme is not available. |
197 }; | 198 }; |
198 | 199 |
199 union ExtraParams { | 200 union ExtraParams { |
201 ExtraParams(); | |
Peter Kasting
2016/02/18 04:03:43
Does just using = default work? Or does the compi
varkha
2016/02/18 05:24:48
No, unfortunately I am still getting uninitialized
| |
202 | |
200 ButtonExtraParams button; | 203 ButtonExtraParams button; |
201 InnerSpinButtonExtraParams inner_spin; | 204 InnerSpinButtonExtraParams inner_spin; |
202 MenuArrowExtraParams menu_arrow; | 205 MenuArrowExtraParams menu_arrow; |
203 MenuCheckExtraParams menu_check; | 206 MenuCheckExtraParams menu_check; |
204 MenuItemExtraParams menu_item; | 207 MenuItemExtraParams menu_item; |
205 MenuListExtraParams menu_list; | 208 MenuListExtraParams menu_list; |
206 MenuBackgroundExtraParams menu_background; | 209 MenuBackgroundExtraParams menu_background; |
207 ProgressBarExtraParams progress_bar; | 210 ProgressBarExtraParams progress_bar; |
208 ScrollbarArrowExtraParams scrollbar_arrow; | 211 ScrollbarArrowExtraParams scrollbar_arrow; |
209 ScrollbarTrackExtraParams scrollbar_track; | 212 ScrollbarTrackExtraParams scrollbar_track; |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
376 private: | 379 private: |
377 // Observers to notify when the native theme changes. | 380 // Observers to notify when the native theme changes. |
378 base::ObserverList<NativeThemeObserver> native_theme_observers_; | 381 base::ObserverList<NativeThemeObserver> native_theme_observers_; |
379 | 382 |
380 DISALLOW_COPY_AND_ASSIGN(NativeTheme); | 383 DISALLOW_COPY_AND_ASSIGN(NativeTheme); |
381 }; | 384 }; |
382 | 385 |
383 } // namespace ui | 386 } // namespace ui |
384 | 387 |
385 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_ | 388 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_ |
OLD | NEW |