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

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

Issue 2001433002: Update appearance of omnibox focus for MD. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: share constant Created 4 years, 7 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/common_theme.cc ('k') | ui/views/controls/textfield/textfield.h » ('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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 case kColorId_ResultsTableSelectedText: 59 case kColorId_ResultsTableSelectedText:
60 case kColorId_ResultsTableNormalHeadline: 60 case kColorId_ResultsTableNormalHeadline:
61 case kColorId_ResultsTableHoveredHeadline: 61 case kColorId_ResultsTableHoveredHeadline:
62 case kColorId_ResultsTableSelectedHeadline: 62 case kColorId_ResultsTableSelectedHeadline:
63 return kResultsTableText; 63 return kResultsTableText;
64 case kColorId_ResultsTableNormalDimmedText: 64 case kColorId_ResultsTableNormalDimmedText:
65 case kColorId_ResultsTableHoveredDimmedText: 65 case kColorId_ResultsTableHoveredDimmedText:
66 case kColorId_ResultsTableSelectedDimmedText: 66 case kColorId_ResultsTableSelectedDimmedText:
67 return kResultsTableDimmedText; 67 return kResultsTableDimmedText;
68 68
69 // FocusableBorder
70 case kColorId_FocusedBorderColor:
71 return gfx::kGoogleBlue300;
72
69 // Intentional pass-throughs to NativeThemeAura. 73 // Intentional pass-throughs to NativeThemeAura.
70 case kColorId_ButtonEnabledColor: 74 case kColorId_ButtonEnabledColor:
71 case kColorId_TextOnCallToActionColor: 75 case kColorId_TextOnCallToActionColor:
72 case kColorId_ResultsTableHoveredBackground: 76 case kColorId_ResultsTableHoveredBackground:
73 case kColorId_ResultsTableSelectedBackground: 77 case kColorId_ResultsTableSelectedBackground:
74 case kColorId_ResultsTableNormalUrl: 78 case kColorId_ResultsTableNormalUrl:
75 case kColorId_ResultsTableHoveredUrl: 79 case kColorId_ResultsTableHoveredUrl:
76 case kColorId_ResultsTableSelectedUrl: 80 case kColorId_ResultsTableSelectedUrl:
77 return NativeThemeAura::GetSystemColor(color_id); 81 return NativeThemeAura::GetSystemColor(color_id);
78 82
79 // Any other color is not defined and shouldn't be used in a dark theme. 83 // Any other color is not defined and shouldn't be used in a dark theme.
80 case kColorId_WindowBackground: 84 case kColorId_WindowBackground:
81 case kColorId_DialogBackground: 85 case kColorId_DialogBackground:
82 case kColorId_BubbleBackground: 86 case kColorId_BubbleBackground:
83 case kColorId_FocusedBorderColor:
84 case kColorId_UnfocusedBorderColor: 87 case kColorId_UnfocusedBorderColor:
85 case kColorId_ButtonBackgroundColor: 88 case kColorId_ButtonBackgroundColor:
86 case kColorId_ButtonDisabledColor: 89 case kColorId_ButtonDisabledColor:
87 case kColorId_ButtonHighlightColor: 90 case kColorId_ButtonHighlightColor:
88 case kColorId_ButtonHoverColor: 91 case kColorId_ButtonHoverColor:
89 case kColorId_ButtonHoverBackgroundColor: 92 case kColorId_ButtonHoverBackgroundColor:
90 case kColorId_BlueButtonEnabledColor: 93 case kColorId_BlueButtonEnabledColor:
91 case kColorId_BlueButtonDisabledColor: 94 case kColorId_BlueButtonDisabledColor:
92 case kColorId_BlueButtonPressedColor: 95 case kColorId_BlueButtonPressedColor:
93 case kColorId_BlueButtonHoverColor: 96 case kColorId_BlueButtonHoverColor:
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 144
142 NOTREACHED(); 145 NOTREACHED();
143 return gfx::kPlaceholderColor; 146 return gfx::kPlaceholderColor;
144 } 147 }
145 148
146 NativeThemeDarkAura::NativeThemeDarkAura() {} 149 NativeThemeDarkAura::NativeThemeDarkAura() {}
147 150
148 NativeThemeDarkAura::~NativeThemeDarkAura() {} 151 NativeThemeDarkAura::~NativeThemeDarkAura() {}
149 152
150 } // namespace ui 153 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/common_theme.cc ('k') | ui/views/controls/textfield/textfield.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698