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

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

Issue 1553583002: Remove placeholder cases for incognito results table colors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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/resource/material_design/material_design_controller.h" 7 #include "ui/base/resource/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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 return kResultsTableDimmedText; 67 return kResultsTableDimmedText;
68 68
69 // Intentional pass-throughs to NativeThemeAura. 69 // Intentional pass-throughs to NativeThemeAura.
70 case kColorId_ResultsTableHoveredBackground: 70 case kColorId_ResultsTableHoveredBackground:
71 case kColorId_ResultsTableSelectedBackground: 71 case kColorId_ResultsTableSelectedBackground:
72 case kColorId_ResultsTableNormalUrl: 72 case kColorId_ResultsTableNormalUrl:
73 case kColorId_ResultsTableHoveredUrl: 73 case kColorId_ResultsTableHoveredUrl:
74 case kColorId_ResultsTableSelectedUrl: 74 case kColorId_ResultsTableSelectedUrl:
75 return NativeThemeAura::GetSystemColor(color_id); 75 return NativeThemeAura::GetSystemColor(color_id);
76 76
77 // Temporary pass-throughs to NativeThemeAura, for colors not yet defined
78 // for dark themes. TODO(estade): define colors for these and remove this
79 // block.
80 case kColorId_ResultsTablePositiveText:
81 case kColorId_ResultsTablePositiveHoveredText:
82 case kColorId_ResultsTablePositiveSelectedText:
83 case kColorId_ResultsTableNegativeText:
84 case kColorId_ResultsTableNegativeHoveredText:
85 case kColorId_ResultsTableNegativeSelectedText:
86 return NativeThemeAura::GetSystemColor(color_id);
87
88 // Any other color is not defined and shouldn't be used in a dark theme. 77 // Any other color is not defined and shouldn't be used in a dark theme.
89 default: 78 default:
90 return gfx::kPlaceholderColor; 79 return gfx::kPlaceholderColor;
91 } 80 }
92 } 81 }
93 82
94 NativeThemeDarkAura::NativeThemeDarkAura() {} 83 NativeThemeDarkAura::NativeThemeDarkAura() {}
95 84
96 NativeThemeDarkAura::~NativeThemeDarkAura() {} 85 NativeThemeDarkAura::~NativeThemeDarkAura() {}
97 86
98 } // namespace ui 87 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698