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

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

Issue 2616273002: Native Themes: Add table header colors (Closed)
Patch Set: Refactor Created 3 years, 11 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
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/common_theme.h" 5 #include "ui/native_theme/common_theme.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 SkColorSetRGB(0xEE, 0xEE, 0xEE); 125 SkColorSetRGB(0xEE, 0xEE, 0xEE);
126 static const SkColor kTreeArrowColor = SkColorSetRGB(0x7A, 0x7A, 0x7A); 126 static const SkColor kTreeArrowColor = SkColorSetRGB(0x7A, 0x7A, 0x7A);
127 // Table: 127 // Table:
128 static const SkColor kTableBackground = SK_ColorWHITE; 128 static const SkColor kTableBackground = SK_ColorWHITE;
129 static const SkColor kTableTextColor = SK_ColorBLACK; 129 static const SkColor kTableTextColor = SK_ColorBLACK;
130 static const SkColor kTableSelectedTextColor = SK_ColorBLACK; 130 static const SkColor kTableSelectedTextColor = SK_ColorBLACK;
131 static const SkColor kTableSelectionBackgroundColor = 131 static const SkColor kTableSelectionBackgroundColor =
132 SkColorSetRGB(0xEE, 0xEE, 0xEE); 132 SkColorSetRGB(0xEE, 0xEE, 0xEE);
133 static const SkColor kTableGroupingIndicatorColor = 133 static const SkColor kTableGroupingIndicatorColor =
134 SkColorSetRGB(0xCC, 0xCC, 0xCC); 134 SkColorSetRGB(0xCC, 0xCC, 0xCC);
135 // Table Header:
136 static const SkColor kTableHeaderText = SK_ColorBLACK;
137 static const SkColor kTableHeaderSeparator = SkColorSetA(SK_ColorBLACK, 0x14);
135 // Material spinner/throbber: 138 // Material spinner/throbber:
136 static const SkColor kThrobberSpinningColor = gfx::kGoogleBlue500; 139 static const SkColor kThrobberSpinningColor = gfx::kGoogleBlue500;
137 static const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); 140 static const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6);
138 static const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); 141 static const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD);
139 142
140 switch (color_id) { 143 switch (color_id) {
141 // Dialogs 144 // Dialogs
142 case NativeTheme::kColorId_WindowBackground: 145 case NativeTheme::kColorId_WindowBackground:
143 case NativeTheme::kColorId_DialogBackground: 146 case NativeTheme::kColorId_DialogBackground:
144 case NativeTheme::kColorId_BubbleBackground: 147 case NativeTheme::kColorId_BubbleBackground:
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 return kTableTextColor; 257 return kTableTextColor;
255 case NativeTheme::kColorId_TableSelectedText: 258 case NativeTheme::kColorId_TableSelectedText:
256 case NativeTheme::kColorId_TableSelectedTextUnfocused: 259 case NativeTheme::kColorId_TableSelectedTextUnfocused:
257 return kTableSelectedTextColor; 260 return kTableSelectedTextColor;
258 case NativeTheme::kColorId_TableSelectionBackgroundFocused: 261 case NativeTheme::kColorId_TableSelectionBackgroundFocused:
259 case NativeTheme::kColorId_TableSelectionBackgroundUnfocused: 262 case NativeTheme::kColorId_TableSelectionBackgroundUnfocused:
260 return kTableSelectionBackgroundColor; 263 return kTableSelectionBackgroundColor;
261 case NativeTheme::kColorId_TableGroupingIndicatorColor: 264 case NativeTheme::kColorId_TableGroupingIndicatorColor:
262 return kTableGroupingIndicatorColor; 265 return kTableGroupingIndicatorColor;
263 266
267 // Table Header
268 case NativeTheme::kColorId_TableHeaderText:
269 return kTableHeaderText;
270 case NativeTheme::kColorId_TableHeaderBackground:
271 return base_theme->GetSystemColor(NativeTheme::kColorId_DialogBackground);
Evan Stade 2017/01/19 00:49:22 Instead of adding new colors I'd just use the menu
Tom (Use chromium acct) 2017/01/19 02:03:23 Done.
Evan Stade 2017/01/19 02:04:29 what I meant was the new ColorIds needn't exist.
272 case NativeTheme::kColorId_TableHeaderSeparator:
273 return kTableHeaderSeparator;
274
264 // FocusableBorder 275 // FocusableBorder
265 case NativeTheme::kColorId_FocusedBorderColor: 276 case NativeTheme::kColorId_FocusedBorderColor:
266 return gfx::kGoogleBlue500; 277 return gfx::kGoogleBlue500;
267 case NativeTheme::kColorId_UnfocusedBorderColor: 278 case NativeTheme::kColorId_UnfocusedBorderColor:
268 return SkColorSetA(SK_ColorBLACK, 0x66); 279 return SkColorSetA(SK_ColorBLACK, 0x66);
269 280
270 // Results Tables 281 // Results Tables
271 case NativeTheme::kColorId_ResultsTableNormalBackground: 282 case NativeTheme::kColorId_ResultsTableNormalBackground:
272 return kTextfieldDefaultBackground; 283 return kTextfieldDefaultBackground;
273 case NativeTheme::kColorId_ResultsTableHoveredBackground: 284 case NativeTheme::kColorId_ResultsTableHoveredBackground:
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 } 361 }
351 if (menu_item.corner_radius > 0) { 362 if (menu_item.corner_radius > 0) {
352 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); 363 const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
353 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint); 364 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
354 return; 365 return;
355 } 366 }
356 canvas->drawRect(gfx::RectToSkRect(rect), paint); 367 canvas->drawRect(gfx::RectToSkRect(rect), paint);
357 } 368 }
358 369
359 } // namespace ui 370 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698