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

Issues Search
    My Issues | Starred     Open | Closed | All

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

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/native_theme.h ('k') | ui/native_theme/native_theme_mac.mm » ('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 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/base/material_design/material_design_controller.h"
8 #include "ui/gfx/color_palette.h" 7 #include "ui/gfx/color_palette.h"
9 8
10 namespace ui { 9 namespace ui {
11 10
12 NativeThemeDarkAura* NativeThemeDarkAura::instance() { 11 NativeThemeDarkAura* NativeThemeDarkAura::instance() {
13 CR_DEFINE_STATIC_LOCAL(NativeThemeDarkAura, s_native_theme, ()); 12 CR_DEFINE_STATIC_LOCAL(NativeThemeDarkAura, s_native_theme, ());
14 return &s_native_theme; 13 return &s_native_theme;
15 } 14 }
16 15
17 SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const { 16 SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
18 if (!ui::MaterialDesignController::IsModeMaterial())
19 return NativeThemeAura::GetSystemColor(color_id);
20
21 static const SkColor kPrimaryTextColor = SK_ColorWHITE; 17 static const SkColor kPrimaryTextColor = SK_ColorWHITE;
22 static const SkColor kDefaultDarkBackground = SkColorSetRGB(0x3C, 0x3C, 0x3E);
23 18
24 static const SkColor kButtonEnabledColor = SK_ColorWHITE; 19 static const SkColor kButtonEnabledColor = SK_ColorWHITE;
25 20
26 static const SkColor kTextfieldDefaultColor = SK_ColorWHITE; 21 static const SkColor kTextfieldDefaultColor = SK_ColorWHITE;
27 static const SkColor kTextfieldDefaultBackground = 22 static const SkColor kTextfieldDefaultBackground =
28 SkColorSetRGB(0x62, 0x62, 0x62); 23 SkColorSetRGB(0x62, 0x62, 0x62);
29 static const SkColor kTextfieldSelectionBackgroundFocused = 24 static const SkColor kTextfieldSelectionBackgroundFocused =
30 SkColorSetA(gfx::kGoogleBlue700, 0xCC); 25 SkColorSetA(gfx::kGoogleBlue700, 0xCC);
31 26
32 static const SkColor kResultsTableNormalBackground = 27 static const SkColor kResultsTableNormalBackground =
33 SkColorSetRGB(0x28, 0x28, 0x28); 28 SkColorSetRGB(0x28, 0x28, 0x28);
34 static const SkColor kResultsTableText = SK_ColorWHITE; 29 static const SkColor kResultsTableText = SK_ColorWHITE;
35 static const SkColor kResultsTableDimmedText = 30 static const SkColor kResultsTableDimmedText =
36 SkColorSetA(kResultsTableText, 0x80); 31 SkColorSetA(kResultsTableText, 0x80);
37 32
38 switch (color_id) { 33 switch (color_id) {
39 // Button 34 // Button
40 case kColorId_ButtonEnabledColor: 35 case kColorId_ButtonEnabledColor:
41 return kButtonEnabledColor; 36 return kButtonEnabledColor;
42 case kColorId_ProminentButtonColor: 37 case kColorId_ProminentButtonColor:
43 return gfx::kGoogleBlue300; 38 return gfx::kGoogleBlue300;
44 39
45 // Label 40 // Label
46 case kColorId_LabelEnabledColor: 41 case kColorId_LabelEnabledColor:
47 return kPrimaryTextColor; 42 return kPrimaryTextColor;
48 case kColorId_LabelBackgroundColor:
49 return kDefaultDarkBackground;
50 43
51 // Link 44 // Link
52 case kColorId_LinkEnabled: 45 case kColorId_LinkEnabled:
53 case kColorId_LinkPressed: 46 case kColorId_LinkPressed:
54 return gfx::kGoogleBlue300; 47 return gfx::kGoogleBlue300;
55 48
56 // Textfield 49 // Textfield
57 case kColorId_TextfieldDefaultColor: 50 case kColorId_TextfieldDefaultColor:
58 case kColorId_TextfieldSelectionColor: 51 case kColorId_TextfieldSelectionColor:
59 return kTextfieldDefaultColor; 52 return kTextfieldDefaultColor;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 case kColorId_ResultsTableNormalUrl: 88 case kColorId_ResultsTableNormalUrl:
96 case kColorId_ResultsTableHoveredUrl: 89 case kColorId_ResultsTableHoveredUrl:
97 case kColorId_ResultsTableSelectedUrl: 90 case kColorId_ResultsTableSelectedUrl:
98 return NativeThemeAura::GetSystemColor(color_id); 91 return NativeThemeAura::GetSystemColor(color_id);
99 92
100 // Any other color is not defined and shouldn't be used in a dark theme. 93 // Any other color is not defined and shouldn't be used in a dark theme.
101 case kColorId_WindowBackground: 94 case kColorId_WindowBackground:
102 case kColorId_DialogBackground: 95 case kColorId_DialogBackground:
103 case kColorId_BubbleBackground: 96 case kColorId_BubbleBackground:
104 case kColorId_UnfocusedBorderColor: 97 case kColorId_UnfocusedBorderColor:
105 case kColorId_ButtonBackgroundColor:
106 case kColorId_ButtonDisabledColor: 98 case kColorId_ButtonDisabledColor:
107 case kColorId_ButtonHighlightColor:
108 case kColorId_ButtonHoverColor: 99 case kColorId_ButtonHoverColor:
109 case kColorId_ButtonHoverBackgroundColor:
110 case kColorId_BlueButtonEnabledColor: 100 case kColorId_BlueButtonEnabledColor:
111 case kColorId_BlueButtonDisabledColor: 101 case kColorId_BlueButtonDisabledColor:
112 case kColorId_BlueButtonPressedColor: 102 case kColorId_BlueButtonPressedColor:
113 case kColorId_BlueButtonHoverColor: 103 case kColorId_BlueButtonHoverColor:
114 case kColorId_BlueButtonShadowColor: 104 case kColorId_BlueButtonShadowColor:
115 case kColorId_EnabledMenuItemForegroundColor: 105 case kColorId_EnabledMenuItemForegroundColor:
116 case kColorId_DisabledMenuItemForegroundColor: 106 case kColorId_DisabledMenuItemForegroundColor:
117 case kColorId_DisabledEmphasizedMenuItemForegroundColor:
118 case kColorId_SelectedMenuItemForegroundColor: 107 case kColorId_SelectedMenuItemForegroundColor:
119 case kColorId_FocusedMenuItemBackgroundColor: 108 case kColorId_FocusedMenuItemBackgroundColor:
120 case kColorId_HoverMenuItemBackgroundColor:
121 case kColorId_MenuSeparatorColor: 109 case kColorId_MenuSeparatorColor:
122 case kColorId_MenuBackgroundColor: 110 case kColorId_MenuBackgroundColor:
123 case kColorId_MenuBorderColor: 111 case kColorId_MenuBorderColor:
124 case kColorId_EnabledMenuButtonBorderColor: 112 case kColorId_EnabledMenuButtonBorderColor:
125 case kColorId_FocusedMenuButtonBorderColor: 113 case kColorId_FocusedMenuButtonBorderColor:
126 case kColorId_HoverMenuButtonBorderColor: 114 case kColorId_HoverMenuButtonBorderColor:
127 case kColorId_LinkDisabled: 115 case kColorId_LinkDisabled:
128 case kColorId_TextfieldReadOnlyColor: 116 case kColorId_TextfieldReadOnlyColor:
129 case kColorId_TextfieldReadOnlyBackground: 117 case kColorId_TextfieldReadOnlyBackground:
130 case kColorId_TooltipBackground: 118 case kColorId_TooltipBackground:
(...skipping 27 matching lines...) Expand all
158 146
159 NOTREACHED(); 147 NOTREACHED();
160 return gfx::kPlaceholderColor; 148 return gfx::kPlaceholderColor;
161 } 149 }
162 150
163 NativeThemeDarkAura::NativeThemeDarkAura() {} 151 NativeThemeDarkAura::NativeThemeDarkAura() {}
164 152
165 NativeThemeDarkAura::~NativeThemeDarkAura() {} 153 NativeThemeDarkAura::~NativeThemeDarkAura() {}
166 154
167 } // namespace ui 155 } // namespace ui
OLDNEW
« ui/native_theme/common_theme.cc ('K') | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_mac.mm » ('j') | ui/views/controls/button/label_button_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698