Chromium Code Reviews| 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/gfx/color_palette.h" | 7 #include "ui/gfx/color_palette.h" |
| 8 | 8 |
| 9 namespace ui { | 9 namespace ui { |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 static const SkColor kTextfieldSelectionBackgroundFocused = | 24 static const SkColor kTextfieldSelectionBackgroundFocused = |
| 25 SkColorSetA(gfx::kGoogleBlue700, 0xCC); | 25 SkColorSetA(gfx::kGoogleBlue700, 0xCC); |
| 26 | 26 |
| 27 static const SkColor kResultsTableNormalBackground = | 27 static const SkColor kResultsTableNormalBackground = |
| 28 SkColorSetRGB(0x28, 0x28, 0x28); | 28 SkColorSetRGB(0x28, 0x28, 0x28); |
| 29 static const SkColor kResultsTableText = SK_ColorWHITE; | 29 static const SkColor kResultsTableText = SK_ColorWHITE; |
| 30 static const SkColor kResultsTableDimmedText = | 30 static const SkColor kResultsTableDimmedText = |
| 31 SkColorSetA(kResultsTableText, 0x80); | 31 SkColorSetA(kResultsTableText, 0x80); |
| 32 | 32 |
| 33 switch (color_id) { | 33 switch (color_id) { |
| 34 // Window | |
|
tdanderson
2016/10/06 14:05:05
Comparing this change to the CL where the regressi
Evan Stade
2016/10/06 15:35:46
we used to have a label background color for dark
| |
| 35 case kColorId_WindowBackground: | |
| 36 case kColorId_DialogBackground: | |
| 37 case kColorId_BubbleBackground: | |
| 38 return SK_ColorBLACK; | |
| 39 | |
| 34 // Button | 40 // Button |
| 35 case kColorId_ButtonEnabledColor: | 41 case kColorId_ButtonEnabledColor: |
| 36 return kButtonEnabledColor; | 42 return kButtonEnabledColor; |
| 37 case kColorId_ProminentButtonColor: | 43 case kColorId_ProminentButtonColor: |
| 38 return gfx::kGoogleBlue300; | 44 return gfx::kGoogleBlue300; |
| 39 | 45 |
| 40 // Label | 46 // Label |
| 41 case kColorId_LabelEnabledColor: | 47 case kColorId_LabelEnabledColor: |
| 42 return kPrimaryTextColor; | 48 return kPrimaryTextColor; |
| 43 | 49 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 case kColorId_TextOnProminentButtonColor: | 90 case kColorId_TextOnProminentButtonColor: |
| 85 case kColorId_ButtonPressedShade: | 91 case kColorId_ButtonPressedShade: |
| 86 case kColorId_ResultsTableHoveredBackground: | 92 case kColorId_ResultsTableHoveredBackground: |
| 87 case kColorId_ResultsTableSelectedBackground: | 93 case kColorId_ResultsTableSelectedBackground: |
| 88 case kColorId_ResultsTableNormalUrl: | 94 case kColorId_ResultsTableNormalUrl: |
| 89 case kColorId_ResultsTableHoveredUrl: | 95 case kColorId_ResultsTableHoveredUrl: |
| 90 case kColorId_ResultsTableSelectedUrl: | 96 case kColorId_ResultsTableSelectedUrl: |
| 91 return NativeThemeAura::GetSystemColor(color_id); | 97 return NativeThemeAura::GetSystemColor(color_id); |
| 92 | 98 |
| 93 // Any other color is not defined and shouldn't be used in a dark theme. | 99 // Any other color is not defined and shouldn't be used in a dark theme. |
| 94 case kColorId_WindowBackground: | |
| 95 case kColorId_DialogBackground: | |
| 96 case kColorId_BubbleBackground: | |
| 97 case kColorId_UnfocusedBorderColor: | 100 case kColorId_UnfocusedBorderColor: |
| 98 case kColorId_ButtonDisabledColor: | 101 case kColorId_ButtonDisabledColor: |
| 99 case kColorId_ButtonHoverColor: | 102 case kColorId_ButtonHoverColor: |
| 100 case kColorId_BlueButtonEnabledColor: | 103 case kColorId_BlueButtonEnabledColor: |
| 101 case kColorId_BlueButtonDisabledColor: | 104 case kColorId_BlueButtonDisabledColor: |
| 102 case kColorId_BlueButtonPressedColor: | 105 case kColorId_BlueButtonPressedColor: |
| 103 case kColorId_BlueButtonHoverColor: | 106 case kColorId_BlueButtonHoverColor: |
| 104 case kColorId_BlueButtonShadowColor: | 107 case kColorId_BlueButtonShadowColor: |
| 105 case kColorId_EnabledMenuItemForegroundColor: | 108 case kColorId_EnabledMenuItemForegroundColor: |
| 106 case kColorId_DisabledMenuItemForegroundColor: | 109 case kColorId_DisabledMenuItemForegroundColor: |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 | 149 |
| 147 NOTREACHED(); | 150 NOTREACHED(); |
| 148 return gfx::kPlaceholderColor; | 151 return gfx::kPlaceholderColor; |
| 149 } | 152 } |
| 150 | 153 |
| 151 NativeThemeDarkAura::NativeThemeDarkAura() {} | 154 NativeThemeDarkAura::NativeThemeDarkAura() {} |
| 152 | 155 |
| 153 NativeThemeDarkAura::~NativeThemeDarkAura() {} | 156 NativeThemeDarkAura::~NativeThemeDarkAura() {} |
| 154 | 157 |
| 155 } // namespace ui | 158 } // namespace ui |
| OLD | NEW |