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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/native_theme/native_theme_dark_aura.cc

Issue 2961223002: Rename native theme color constants relating to text on dialog buttons
Patch Set: rebase Created 3 years, 5 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
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "ui/native_theme/native_theme_dark_aura.h" 5 #include "ui/native_theme/native_theme_dark_aura.h"
6 6
7 #include "ui/gfx/color_palette.h" 7 #include "ui/gfx/color_palette.h"
8 8
9 namespace ui { 9 namespace ui {
10 10
(...skipping 20 matching lines...) Expand all
31 SkColorSetA(kResultsTableText, 0x80); 31 SkColorSetA(kResultsTableText, 0x80);
32 32
33 switch (color_id) { 33 switch (color_id) {
34 // Window 34 // Window
35 case kColorId_WindowBackground: 35 case kColorId_WindowBackground:
36 case kColorId_DialogBackground: 36 case kColorId_DialogBackground:
37 case kColorId_BubbleBackground: 37 case kColorId_BubbleBackground:
38 return SK_ColorBLACK; 38 return SK_ColorBLACK;
39 39
40 // Button 40 // Button
41 case kColorId_ButtonEnabledColor: 41 case kColorId_TextOnEnabledDialogButton:
42 return kButtonEnabledColor; 42 return kButtonEnabledColor;
43 case kColorId_ProminentButtonColor: 43 case kColorId_ProminentButtonColor:
44 return gfx::kGoogleBlue300; 44 return gfx::kGoogleBlue300;
45 45
46 // Label 46 // Label
47 case kColorId_LabelEnabledColor: 47 case kColorId_LabelEnabledColor:
48 case kColorId_LabelTextSelectionColor: 48 case kColorId_LabelTextSelectionColor:
49 return kPrimaryTextColor; 49 return kPrimaryTextColor;
50 case kColorId_LabelTextSelectionBackgroundFocused: 50 case kColorId_LabelTextSelectionBackgroundFocused:
51 return kTextSelectionBackgroundFocused; 51 return kTextSelectionBackgroundFocused;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // Alert icons 83 // Alert icons
84 case kColorId_AlertSeverityLow: 84 case kColorId_AlertSeverityLow:
85 return gfx::kGoogleGreen300; 85 return gfx::kGoogleGreen300;
86 case kColorId_AlertSeverityMedium: 86 case kColorId_AlertSeverityMedium:
87 return gfx::kGoogleYellow300; 87 return gfx::kGoogleYellow300;
88 case kColorId_AlertSeverityHigh: 88 case kColorId_AlertSeverityHigh:
89 return gfx::kGoogleRed300; 89 return gfx::kGoogleRed300;
90 90
91 // Intentional pass-throughs to NativeThemeAura. 91 // Intentional pass-throughs to NativeThemeAura.
92 case kColorId_LabelDisabledColor: 92 case kColorId_LabelDisabledColor:
93 case kColorId_TextOnProminentButtonColor: 93 case kColorId_TextOnProminentDialogButton:
94 case kColorId_ButtonPressedShade: 94 case kColorId_ButtonPressedShade:
95 case kColorId_ResultsTableHoveredBackground: 95 case kColorId_ResultsTableHoveredBackground:
96 case kColorId_ResultsTableSelectedBackground: 96 case kColorId_ResultsTableSelectedBackground:
97 case kColorId_ResultsTableNormalUrl: 97 case kColorId_ResultsTableNormalUrl:
98 case kColorId_ResultsTableHoveredUrl: 98 case kColorId_ResultsTableHoveredUrl:
99 case kColorId_ResultsTableSelectedUrl: 99 case kColorId_ResultsTableSelectedUrl:
100 return NativeThemeAura::GetSystemColor(color_id); 100 return NativeThemeAura::GetSystemColor(color_id);
101 101
102 // Any other color is not defined and shouldn't be used in a dark theme. 102 // Any other color is not defined and shouldn't be used in a dark theme.
103 case kColorId_UnfocusedBorderColor: 103 case kColorId_UnfocusedBorderColor:
104 case kColorId_ButtonDisabledColor: 104 case kColorId_TextOnDisabledDialogButton:
105 case kColorId_ButtonHoverColor: 105 case kColorId_ButtonHoverColor:
106 case kColorId_BlueButtonEnabledColor: 106 case kColorId_BlueButtonEnabledColor:
107 case kColorId_BlueButtonDisabledColor: 107 case kColorId_BlueButtonDisabledColor:
108 case kColorId_BlueButtonPressedColor: 108 case kColorId_BlueButtonPressedColor:
109 case kColorId_BlueButtonHoverColor: 109 case kColorId_BlueButtonHoverColor:
110 case kColorId_BlueButtonShadowColor: 110 case kColorId_BlueButtonShadowColor:
111 case kColorId_EnabledMenuItemForegroundColor: 111 case kColorId_EnabledMenuItemForegroundColor:
112 case kColorId_DisabledMenuItemForegroundColor: 112 case kColorId_DisabledMenuItemForegroundColor:
113 case kColorId_SelectedMenuItemForegroundColor: 113 case kColorId_SelectedMenuItemForegroundColor:
114 case kColorId_FocusedMenuItemBackgroundColor: 114 case kColorId_FocusedMenuItemBackgroundColor:
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 NOTREACHED(); 154 NOTREACHED();
155 return gfx::kPlaceholderColor; 155 return gfx::kPlaceholderColor;
156 } 156 }
157 157
158 NativeThemeDarkAura::NativeThemeDarkAura() : NativeThemeAura(false) {} 158 NativeThemeDarkAura::NativeThemeDarkAura() : NativeThemeAura(false) {}
159 159
160 NativeThemeDarkAura::~NativeThemeDarkAura() {} 160 NativeThemeDarkAura::~NativeThemeDarkAura() {}
161 161
162 } // namespace ui 162 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698