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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/native_theme/native_theme.h

Issue 2382443007: Clean up NativeTheme (particularly CommonTheme). (Closed)
Patch Set: two slight fixes Created 4 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
« ui/native_theme/common_theme.cc ('K') | « ui/native_theme/common_theme.cc ('k') | ui/native_theme/native_theme_dark_aura.cc » ('j') | ui/views/controls/button/label_button_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 enum ColorId { 246 enum ColorId {
247 // Windows 247 // Windows
248 kColorId_WindowBackground, 248 kColorId_WindowBackground,
249 // Dialogs 249 // Dialogs
250 kColorId_DialogBackground, 250 kColorId_DialogBackground,
251 kColorId_BubbleBackground, 251 kColorId_BubbleBackground,
252 // FocusableBorder 252 // FocusableBorder
253 kColorId_FocusedBorderColor, 253 kColorId_FocusedBorderColor,
254 kColorId_UnfocusedBorderColor, 254 kColorId_UnfocusedBorderColor,
255 // Button 255 // Button
256 kColorId_ButtonBackgroundColor,
257 kColorId_ButtonEnabledColor, 256 kColorId_ButtonEnabledColor,
258 kColorId_ButtonDisabledColor, 257 kColorId_ButtonDisabledColor,
259 kColorId_ButtonHighlightColor,
260 kColorId_ButtonHoverColor, 258 kColorId_ButtonHoverColor,
261 kColorId_ButtonHoverBackgroundColor,
262 kColorId_ButtonPressedShade, 259 kColorId_ButtonPressedShade,
263 kColorId_BlueButtonEnabledColor, 260 kColorId_BlueButtonEnabledColor,
264 kColorId_BlueButtonDisabledColor, 261 kColorId_BlueButtonDisabledColor,
265 kColorId_BlueButtonPressedColor, 262 kColorId_BlueButtonPressedColor,
266 kColorId_BlueButtonHoverColor, 263 kColorId_BlueButtonHoverColor,
267 kColorId_BlueButtonShadowColor, 264 kColorId_BlueButtonShadowColor,
268 kColorId_ProminentButtonColor, 265 kColorId_ProminentButtonColor,
269 kColorId_TextOnProminentButtonColor, 266 kColorId_TextOnProminentButtonColor,
270 // MenuItem 267 // MenuItem
271 kColorId_EnabledMenuItemForegroundColor, 268 kColorId_EnabledMenuItemForegroundColor,
272 kColorId_DisabledMenuItemForegroundColor, 269 kColorId_DisabledMenuItemForegroundColor,
273 kColorId_DisabledEmphasizedMenuItemForegroundColor,
274 kColorId_SelectedMenuItemForegroundColor, 270 kColorId_SelectedMenuItemForegroundColor,
275 kColorId_FocusedMenuItemBackgroundColor, 271 kColorId_FocusedMenuItemBackgroundColor,
276 kColorId_HoverMenuItemBackgroundColor,
277 kColorId_MenuSeparatorColor, 272 kColorId_MenuSeparatorColor,
278 kColorId_MenuBackgroundColor, 273 kColorId_MenuBackgroundColor,
279 kColorId_MenuBorderColor, 274 kColorId_MenuBorderColor,
280 // MenuButton - buttons in wrench menu 275 // MenuButton - buttons in wrench menu
281 kColorId_EnabledMenuButtonBorderColor, 276 kColorId_EnabledMenuButtonBorderColor,
282 kColorId_FocusedMenuButtonBorderColor, 277 kColorId_FocusedMenuButtonBorderColor,
283 kColorId_HoverMenuButtonBorderColor, 278 kColorId_HoverMenuButtonBorderColor,
284 // Label 279 // Label
285 kColorId_LabelEnabledColor, 280 kColorId_LabelEnabledColor,
286 kColorId_LabelDisabledColor, 281 kColorId_LabelDisabledColor,
287 kColorId_LabelBackgroundColor,
288 // Link 282 // Link
289 kColorId_LinkDisabled, 283 kColorId_LinkDisabled,
290 kColorId_LinkEnabled, 284 kColorId_LinkEnabled,
291 kColorId_LinkPressed, 285 kColorId_LinkPressed,
292 // Textfield 286 // Textfield
293 kColorId_TextfieldDefaultColor, 287 kColorId_TextfieldDefaultColor,
294 kColorId_TextfieldDefaultBackground, 288 kColorId_TextfieldDefaultBackground,
295 kColorId_TextfieldReadOnlyColor, 289 kColorId_TextfieldReadOnlyColor,
296 kColorId_TextfieldReadOnlyBackground, 290 kColorId_TextfieldReadOnlyBackground,
297 kColorId_TextfieldSelectionColor, 291 kColorId_TextfieldSelectionColor,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 private: 374 private:
381 // Observers to notify when the native theme changes. 375 // Observers to notify when the native theme changes.
382 base::ObserverList<NativeThemeObserver> native_theme_observers_; 376 base::ObserverList<NativeThemeObserver> native_theme_observers_;
383 377
384 DISALLOW_COPY_AND_ASSIGN(NativeTheme); 378 DISALLOW_COPY_AND_ASSIGN(NativeTheme);
385 }; 379 };
386 380
387 } // namespace ui 381 } // namespace ui
388 382
389 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_ 383 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_
OLDNEW
« ui/native_theme/common_theme.cc ('K') | « ui/native_theme/common_theme.cc ('k') | ui/native_theme/native_theme_dark_aura.cc » ('j') | ui/views/controls/button/label_button_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698