Chromium Code Reviews Chromium Code Reviews
Issue 2245143005:
Move upgrade severity colors into NativeTheme. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 | 69 // FocusableBorder |
| 70 case kColorId_FocusedBorderColor: | 70 case kColorId_FocusedBorderColor: |
| 71 return gfx::kGoogleBlue300; | 71 return gfx::kGoogleBlue300; |
| 72 | 72 |
| 73 // Alert icons | |
|
tdanderson
2016/08/17 19:44:58
nit: .
Evan Stade
2016/08/17 20:18:38
the others (above) don't do this. The comments bel
| |
| 74 case kColorId_AlertSeverityLow: | |
| 75 return gfx::kGoogleGreen300; | |
| 76 case kColorId_AlertSeverityMedium: | |
| 77 return gfx::kGoogleYellow300; | |
| 78 case kColorId_AlertSeverityHigh: | |
| 79 return gfx::kGoogleRed300; | |
| 80 | |
| 73 // Intentional pass-throughs to NativeThemeAura. | 81 // Intentional pass-throughs to NativeThemeAura. |
| 74 case kColorId_TextOnCallToActionColor: | 82 case kColorId_TextOnCallToActionColor: |
| 75 case kColorId_ResultsTableHoveredBackground: | 83 case kColorId_ResultsTableHoveredBackground: |
| 76 case kColorId_ResultsTableSelectedBackground: | 84 case kColorId_ResultsTableSelectedBackground: |
| 77 case kColorId_ResultsTableNormalUrl: | 85 case kColorId_ResultsTableNormalUrl: |
| 78 case kColorId_ResultsTableHoveredUrl: | 86 case kColorId_ResultsTableHoveredUrl: |
| 79 case kColorId_ResultsTableSelectedUrl: | 87 case kColorId_ResultsTableSelectedUrl: |
| 80 return NativeThemeAura::GetSystemColor(color_id); | 88 return NativeThemeAura::GetSystemColor(color_id); |
| 81 | 89 |
| 82 // Any other color is not defined and shouldn't be used in a dark theme. | 90 // Any other color is not defined and shouldn't be used in a dark theme. |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 | 151 |
| 144 NOTREACHED(); | 152 NOTREACHED(); |
| 145 return gfx::kPlaceholderColor; | 153 return gfx::kPlaceholderColor; |
| 146 } | 154 } |
| 147 | 155 |
| 148 NativeThemeDarkAura::NativeThemeDarkAura() {} | 156 NativeThemeDarkAura::NativeThemeDarkAura() {} |
| 149 | 157 |
| 150 NativeThemeDarkAura::~NativeThemeDarkAura() {} | 158 NativeThemeDarkAura::~NativeThemeDarkAura() {} |
| 151 | 159 |
| 152 } // namespace ui | 160 } // namespace ui |
| OLD | NEW |
