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

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

Issue 2375543003: Add SetProminent() to MdTextButton to create blue buttons. (Closed)
Patch Set: Fix nits. 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
« 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/base/material_design/material_design_controller.h" 7 #include "ui/base/material_design/material_design_controller.h"
8 #include "ui/gfx/color_palette.h" 8 #include "ui/gfx/color_palette.h"
9 9
10 namespace ui { 10 namespace ui {
(...skipping 21 matching lines...) Expand all
32 static const SkColor kResultsTableNormalBackground = 32 static const SkColor kResultsTableNormalBackground =
33 SkColorSetRGB(0x28, 0x28, 0x28); 33 SkColorSetRGB(0x28, 0x28, 0x28);
34 static const SkColor kResultsTableText = SK_ColorWHITE; 34 static const SkColor kResultsTableText = SK_ColorWHITE;
35 static const SkColor kResultsTableDimmedText = 35 static const SkColor kResultsTableDimmedText =
36 SkColorSetA(kResultsTableText, 0x80); 36 SkColorSetA(kResultsTableText, 0x80);
37 37
38 switch (color_id) { 38 switch (color_id) {
39 // Button 39 // Button
40 case kColorId_ButtonEnabledColor: 40 case kColorId_ButtonEnabledColor:
41 return kButtonEnabledColor; 41 return kButtonEnabledColor;
42 case kColorId_CallToActionColor: 42 case kColorId_ProminentButtonColor:
43 return gfx::kGoogleBlue300; 43 return gfx::kGoogleBlue300;
44 44
45 // Label 45 // Label
46 case kColorId_LabelEnabledColor: 46 case kColorId_LabelEnabledColor:
47 return kPrimaryTextColor; 47 return kPrimaryTextColor;
48 case kColorId_LabelBackgroundColor: 48 case kColorId_LabelBackgroundColor:
49 return kDefaultDarkBackground; 49 return kDefaultDarkBackground;
50 50
51 // Link 51 // Link
52 case kColorId_LinkEnabled: 52 case kColorId_LinkEnabled:
(...skipping 28 matching lines...) Expand all
81 // Alert icons 81 // Alert icons
82 case kColorId_AlertSeverityLow: 82 case kColorId_AlertSeverityLow:
83 return gfx::kGoogleGreen300; 83 return gfx::kGoogleGreen300;
84 case kColorId_AlertSeverityMedium: 84 case kColorId_AlertSeverityMedium:
85 return gfx::kGoogleYellow300; 85 return gfx::kGoogleYellow300;
86 case kColorId_AlertSeverityHigh: 86 case kColorId_AlertSeverityHigh:
87 return gfx::kGoogleRed300; 87 return gfx::kGoogleRed300;
88 88
89 // Intentional pass-throughs to NativeThemeAura. 89 // Intentional pass-throughs to NativeThemeAura.
90 case kColorId_LabelDisabledColor: 90 case kColorId_LabelDisabledColor:
91 case kColorId_TextOnCallToActionColor: 91 case kColorId_TextOnProminentButtonColor:
92 case kColorId_ButtonPressedShade: 92 case kColorId_ButtonPressedShade:
93 case kColorId_ResultsTableHoveredBackground: 93 case kColorId_ResultsTableHoveredBackground:
94 case kColorId_ResultsTableSelectedBackground: 94 case kColorId_ResultsTableSelectedBackground:
95 case kColorId_ResultsTableNormalUrl: 95 case kColorId_ResultsTableNormalUrl:
96 case kColorId_ResultsTableHoveredUrl: 96 case kColorId_ResultsTableHoveredUrl:
97 case kColorId_ResultsTableSelectedUrl: 97 case kColorId_ResultsTableSelectedUrl:
98 return NativeThemeAura::GetSystemColor(color_id); 98 return NativeThemeAura::GetSystemColor(color_id);
99 99
100 // Any other color is not defined and shouldn't be used in a dark theme. 100 // Any other color is not defined and shouldn't be used in a dark theme.
101 case kColorId_WindowBackground: 101 case kColorId_WindowBackground:
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 NOTREACHED(); 159 NOTREACHED();
160 return gfx::kPlaceholderColor; 160 return gfx::kPlaceholderColor;
161 } 161 }
162 162
163 NativeThemeDarkAura::NativeThemeDarkAura() {} 163 NativeThemeDarkAura::NativeThemeDarkAura() {}
164 164
165 NativeThemeDarkAura::~NativeThemeDarkAura() {} 165 NativeThemeDarkAura::~NativeThemeDarkAura() {}
166 166
167 } // namespace ui 167 } // 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