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/native_theme_dark_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_aura.cc ('k') | ui/native_theme/native_theme_win.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 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 case kColorId_ResultsTableHoveredBackground: 80 case kColorId_ResultsTableHoveredBackground:
81 case kColorId_ResultsTableSelectedBackground: 81 case kColorId_ResultsTableSelectedBackground:
82 case kColorId_ResultsTableNormalUrl: 82 case kColorId_ResultsTableNormalUrl:
83 case kColorId_ResultsTableHoveredUrl: 83 case kColorId_ResultsTableHoveredUrl:
84 case kColorId_ResultsTableSelectedUrl: 84 case kColorId_ResultsTableSelectedUrl:
85 return NativeThemeAura::GetSystemColor(color_id); 85 return NativeThemeAura::GetSystemColor(color_id);
86 86
87 // Temporary pass-throughs to NativeThemeAura, for colors not yet defined 87 // Temporary pass-throughs to NativeThemeAura, for colors not yet defined
88 // for dark themes. TODO(estade): define colors for these and remove this 88 // for dark themes. TODO(estade): define colors for these and remove this
89 // block. 89 // block.
90 case kColorId_ResultsTableNormalDivider:
91 case kColorId_ResultsTableHoveredDivider:
92 case kColorId_ResultsTableSelectedDivider:
93 case kColorId_ResultsTablePositiveText: 90 case kColorId_ResultsTablePositiveText:
94 case kColorId_ResultsTablePositiveHoveredText: 91 case kColorId_ResultsTablePositiveHoveredText:
95 case kColorId_ResultsTablePositiveSelectedText: 92 case kColorId_ResultsTablePositiveSelectedText:
96 case kColorId_ResultsTableNegativeText: 93 case kColorId_ResultsTableNegativeText:
97 case kColorId_ResultsTableNegativeHoveredText: 94 case kColorId_ResultsTableNegativeHoveredText:
98 case kColorId_ResultsTableNegativeSelectedText: 95 case kColorId_ResultsTableNegativeSelectedText:
99 return NativeThemeAura::GetSystemColor(color_id); 96 return NativeThemeAura::GetSystemColor(color_id);
100 97
101 // Any other color is not defined and shouldn't be used in a dark theme. 98 // Any other color is not defined and shouldn't be used in a dark theme.
102 default: 99 default:
103 return gfx::kPlaceholderColor; 100 return gfx::kPlaceholderColor;
104 } 101 }
105 } 102 }
106 103
107 NativeThemeDarkAura::NativeThemeDarkAura() {} 104 NativeThemeDarkAura::NativeThemeDarkAura() {}
108 105
109 NativeThemeDarkAura::~NativeThemeDarkAura() {} 106 NativeThemeDarkAura::~NativeThemeDarkAura() {}
110 107
111 } // namespace ui 108 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_aura.cc ('k') | ui/native_theme/native_theme_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698