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

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

Issue 1454983003: Remove unused color from NativeTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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_dark_aura.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_aura.h" 5 #include "ui/native_theme/native_theme_aura.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/layout.h" 10 #include "ui/base/layout.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB); 105 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
106 106
107 // MD colors. 107 // MD colors.
108 if (ui::MaterialDesignController::IsModeMaterial()) { 108 if (ui::MaterialDesignController::IsModeMaterial()) {
109 // Dialogs: 109 // Dialogs:
110 static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE; 110 static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE;
111 // Results tables: 111 // Results tables:
112 static const SkColor kResultsTableTextMd = SK_ColorBLACK; 112 static const SkColor kResultsTableTextMd = SK_ColorBLACK;
113 static const SkColor kResultsTableDimmedTextMd = 113 static const SkColor kResultsTableDimmedTextMd =
114 SkColorSetRGB(0x64, 0x64, 0x64); 114 SkColorSetRGB(0x64, 0x64, 0x64);
115 static const SkColor kResultsTableDividerMd = color_utils::AlphaBlend(
116 kResultsTableTextMd, kTextfieldDefaultBackground, 0x34);
117 static const SkColor kResultsTableSelectedDividerMd =
118 color_utils::AlphaBlend(kResultsTableTextMd,
119 kTextfieldSelectionBackgroundFocused, 0x34);
120 static const SkColor kPositiveTextColorMd = SkColorSetRGB(0x0b, 0x80, 0x43); 115 static const SkColor kPositiveTextColorMd = SkColorSetRGB(0x0b, 0x80, 0x43);
121 static const SkColor kNegativeTextColorMd = SkColorSetRGB(0xc5, 0x39, 0x29); 116 static const SkColor kNegativeTextColorMd = SkColorSetRGB(0xc5, 0x39, 0x29);
122 117
123 switch (color_id) { 118 switch (color_id) {
124 // Dialogs 119 // Dialogs
125 case kColorId_DialogBackground: 120 case kColorId_DialogBackground:
126 case kColorId_BubbleBackground: 121 case kColorId_BubbleBackground:
127 return kDialogBackgroundColorMd; 122 return kDialogBackgroundColorMd;
128 123
129 // Results Tables 124 // Results Tables
(...skipping 11 matching lines...) Expand all
141 case kColorId_ResultsTableSelectedHeadline: 136 case kColorId_ResultsTableSelectedHeadline:
142 return kResultsTableTextMd; 137 return kResultsTableTextMd;
143 case kColorId_ResultsTableNormalDimmedText: 138 case kColorId_ResultsTableNormalDimmedText:
144 case kColorId_ResultsTableHoveredDimmedText: 139 case kColorId_ResultsTableHoveredDimmedText:
145 case kColorId_ResultsTableSelectedDimmedText: 140 case kColorId_ResultsTableSelectedDimmedText:
146 return kResultsTableDimmedTextMd; 141 return kResultsTableDimmedTextMd;
147 case kColorId_ResultsTableNormalUrl: 142 case kColorId_ResultsTableNormalUrl:
148 case kColorId_ResultsTableHoveredUrl: 143 case kColorId_ResultsTableHoveredUrl:
149 case kColorId_ResultsTableSelectedUrl: 144 case kColorId_ResultsTableSelectedUrl:
150 return GetSystemColor(kColorId_LinkEnabled); 145 return GetSystemColor(kColorId_LinkEnabled);
151 case kColorId_ResultsTableNormalDivider:
152 case kColorId_ResultsTableHoveredDivider:
153 return kResultsTableDividerMd;
154 case kColorId_ResultsTableSelectedDivider:
155 return kResultsTableSelectedDividerMd;
156 case kColorId_ResultsTablePositiveText: 146 case kColorId_ResultsTablePositiveText:
157 case kColorId_ResultsTablePositiveHoveredText: 147 case kColorId_ResultsTablePositiveHoveredText:
158 case kColorId_ResultsTablePositiveSelectedText: 148 case kColorId_ResultsTablePositiveSelectedText:
159 return kPositiveTextColorMd; 149 return kPositiveTextColorMd;
160 case kColorId_ResultsTableNegativeText: 150 case kColorId_ResultsTableNegativeText:
161 case kColorId_ResultsTableNegativeHoveredText: 151 case kColorId_ResultsTableNegativeHoveredText:
162 case kColorId_ResultsTableNegativeSelectedText: 152 case kColorId_ResultsTableNegativeSelectedText:
163 return kNegativeTextColorMd; 153 return kNegativeTextColorMd;
164 154
165 default: 155 default:
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 static const SkColor kResultsTableNormalDimmedText = 216 static const SkColor kResultsTableNormalDimmedText =
227 color_utils::AlphaBlend(SK_ColorBLACK, kTextfieldDefaultBackground, 0xBB); 217 color_utils::AlphaBlend(SK_ColorBLACK, kTextfieldDefaultBackground, 0xBB);
228 static const SkColor kResultsTableHoveredDimmedText = color_utils::AlphaBlend( 218 static const SkColor kResultsTableHoveredDimmedText = color_utils::AlphaBlend(
229 SK_ColorBLACK, kResultsTableHoveredBackground, 0xBB); 219 SK_ColorBLACK, kResultsTableHoveredBackground, 0xBB);
230 static const SkColor kResultsTableSelectedDimmedText = 220 static const SkColor kResultsTableSelectedDimmedText =
231 color_utils::AlphaBlend(SK_ColorBLACK, 221 color_utils::AlphaBlend(SK_ColorBLACK,
232 kTextfieldSelectionBackgroundFocused, 0xBB); 222 kTextfieldSelectionBackgroundFocused, 0xBB);
233 static const SkColor kResultsTableNormalUrl = kTextfieldSelectionColor; 223 static const SkColor kResultsTableNormalUrl = kTextfieldSelectionColor;
234 static const SkColor kResultsTableSelectedOrHoveredUrl = 224 static const SkColor kResultsTableSelectedOrHoveredUrl =
235 SkColorSetARGB(0xff, 0x0b, 0x80, 0x43); 225 SkColorSetARGB(0xff, 0x0b, 0x80, 0x43);
236 static const SkColor kResultsTableNormalDivider = color_utils::AlphaBlend(
237 kResultsTableNormalText, kTextfieldDefaultBackground, 0x34);
238 static const SkColor kResultsTableHoveredDivider = color_utils::AlphaBlend(
239 kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34);
240 static const SkColor kResultsTableSelectedDivider = color_utils::AlphaBlend(
241 kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34);
242 const SkColor kPositiveTextColor = SkColorSetRGB(0x0b, 0x80, 0x43); 226 const SkColor kPositiveTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
243 const SkColor kNegativeTextColor = SkColorSetRGB(0xc5, 0x39, 0x29); 227 const SkColor kNegativeTextColor = SkColorSetRGB(0xc5, 0x39, 0x29);
244 static const SkColor kResultsTablePositiveText = color_utils::AlphaBlend( 228 static const SkColor kResultsTablePositiveText = color_utils::AlphaBlend(
245 kPositiveTextColor, kTextfieldDefaultBackground, 0xDD); 229 kPositiveTextColor, kTextfieldDefaultBackground, 0xDD);
246 static const SkColor kResultsTablePositiveHoveredText = 230 static const SkColor kResultsTablePositiveHoveredText =
247 color_utils::AlphaBlend(kPositiveTextColor, 231 color_utils::AlphaBlend(kPositiveTextColor,
248 kResultsTableHoveredBackground, 0xDD); 232 kResultsTableHoveredBackground, 0xDD);
249 static const SkColor kResultsTablePositiveSelectedText = 233 static const SkColor kResultsTablePositiveSelectedText =
250 color_utils::AlphaBlend(kPositiveTextColor, 234 color_utils::AlphaBlend(kPositiveTextColor,
251 kTextfieldSelectionBackgroundFocused, 0xDD); 235 kTextfieldSelectionBackgroundFocused, 0xDD);
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 case kColorId_ResultsTableHoveredHeadline: 358 case kColorId_ResultsTableHoveredHeadline:
375 return kResultsTableHoveredDimmedText; 359 return kResultsTableHoveredDimmedText;
376 case kColorId_ResultsTableSelectedDimmedText: 360 case kColorId_ResultsTableSelectedDimmedText:
377 case kColorId_ResultsTableSelectedHeadline: 361 case kColorId_ResultsTableSelectedHeadline:
378 return kResultsTableSelectedDimmedText; 362 return kResultsTableSelectedDimmedText;
379 case kColorId_ResultsTableNormalUrl: 363 case kColorId_ResultsTableNormalUrl:
380 return kResultsTableNormalUrl; 364 return kResultsTableNormalUrl;
381 case kColorId_ResultsTableHoveredUrl: 365 case kColorId_ResultsTableHoveredUrl:
382 case kColorId_ResultsTableSelectedUrl: 366 case kColorId_ResultsTableSelectedUrl:
383 return kResultsTableSelectedOrHoveredUrl; 367 return kResultsTableSelectedOrHoveredUrl;
384 case kColorId_ResultsTableNormalDivider:
385 return kResultsTableNormalDivider;
386 case kColorId_ResultsTableHoveredDivider:
387 return kResultsTableHoveredDivider;
388 case kColorId_ResultsTableSelectedDivider:
389 return kResultsTableSelectedDivider;
390 case kColorId_ResultsTablePositiveText: 368 case kColorId_ResultsTablePositiveText:
391 return kResultsTablePositiveText; 369 return kResultsTablePositiveText;
392 case kColorId_ResultsTablePositiveHoveredText: 370 case kColorId_ResultsTablePositiveHoveredText:
393 return kResultsTablePositiveHoveredText; 371 return kResultsTablePositiveHoveredText;
394 case kColorId_ResultsTablePositiveSelectedText: 372 case kColorId_ResultsTablePositiveSelectedText:
395 return kResultsTablePositiveSelectedText; 373 return kResultsTablePositiveSelectedText;
396 case kColorId_ResultsTableNegativeText: 374 case kColorId_ResultsTableNegativeText:
397 return kResultsTableNegativeText; 375 return kResultsTableNegativeText;
398 case kColorId_ResultsTableNegativeHoveredText: 376 case kColorId_ResultsTableNegativeHoveredText:
399 return kResultsTableNegativeHoveredText; 377 return kResultsTableNegativeHoveredText;
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 scoped_ptr<NineImagePainter> stroke_painter, 614 scoped_ptr<NineImagePainter> stroke_painter,
637 const uint8 stroke_alphas[kNumStates]) 615 const uint8 stroke_alphas[kNumStates])
638 : fill_painter(fill_painter.Pass()), 616 : fill_painter(fill_painter.Pass()),
639 fill_alphas(fill_alphas), 617 fill_alphas(fill_alphas),
640 stroke_painter(stroke_painter.Pass()), 618 stroke_painter(stroke_painter.Pass()),
641 stroke_alphas(stroke_alphas) {} 619 stroke_alphas(stroke_alphas) {}
642 620
643 NativeThemeAura::DualPainter::~DualPainter() {} 621 NativeThemeAura::DualPainter::~DualPainter() {}
644 622
645 } // namespace ui 623 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/native_theme/native_theme_dark_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698