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

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

Issue 2319313003: views: refactor away PlatformStyle::BackgroundColorForMdButton (Closed)
Patch Set: fix nits Created 4 years, 3 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 case kColorId_AlertSeverityHigh: 89 case kColorId_AlertSeverityHigh:
90 return gfx::kGoogleRed300; 90 return gfx::kGoogleRed300;
91 91
92 // Intentional pass-throughs to NativeThemeAura. 92 // Intentional pass-throughs to NativeThemeAura.
93 case kColorId_TextOnCallToActionColor: 93 case kColorId_TextOnCallToActionColor:
94 case kColorId_ResultsTableHoveredBackground: 94 case kColorId_ResultsTableHoveredBackground:
95 case kColorId_ResultsTableSelectedBackground: 95 case kColorId_ResultsTableSelectedBackground:
96 case kColorId_ResultsTableNormalUrl: 96 case kColorId_ResultsTableNormalUrl:
97 case kColorId_ResultsTableHoveredUrl: 97 case kColorId_ResultsTableHoveredUrl:
98 case kColorId_ResultsTableSelectedUrl: 98 case kColorId_ResultsTableSelectedUrl:
99 case kColorId_ButtonPressedShade:
Evan Stade 2016/09/08 16:36:49 nit: perhaps keep these in declaration order? i.e.
99 return NativeThemeAura::GetSystemColor(color_id); 100 return NativeThemeAura::GetSystemColor(color_id);
100 101
101 // 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.
102 case kColorId_WindowBackground: 103 case kColorId_WindowBackground:
103 case kColorId_DialogBackground: 104 case kColorId_DialogBackground:
104 case kColorId_BubbleBackground: 105 case kColorId_BubbleBackground:
105 case kColorId_UnfocusedBorderColor: 106 case kColorId_UnfocusedBorderColor:
106 case kColorId_ButtonBackgroundColor: 107 case kColorId_ButtonBackgroundColor:
107 case kColorId_ButtonDisabledColor: 108 case kColorId_ButtonDisabledColor:
108 case kColorId_ButtonHighlightColor: 109 case kColorId_ButtonHighlightColor:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 160
160 NOTREACHED(); 161 NOTREACHED();
161 return gfx::kPlaceholderColor; 162 return gfx::kPlaceholderColor;
162 } 163 }
163 164
164 NativeThemeDarkAura::NativeThemeDarkAura() {} 165 NativeThemeDarkAura::NativeThemeDarkAura() {}
165 166
166 NativeThemeDarkAura::~NativeThemeDarkAura() {} 167 NativeThemeDarkAura::~NativeThemeDarkAura() {}
167 168
168 } // namespace ui 169 } // 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