Chromium Code Reviews Chromium Code Reviews
Issue 288983010:
fix text color of BlueButton on GTK-theme-mode Linux Aura. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 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/fallback_theme.h" | 5 #include "ui/native_theme/fallback_theme.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "ui/gfx/color_utils.h" | 9 #include "ui/gfx/color_utils.h" |
| 10 #include "ui/native_theme/common_theme.h" | 10 #include "ui/native_theme/common_theme.h" |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 static const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE); | 31 static const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE); |
| 32 static const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9); | 32 static const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9); |
| 33 // Button: | 33 // Button: |
| 34 static const SkColor kButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE); | 34 static const SkColor kButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE); |
| 35 static const SkColor kButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22); | 35 static const SkColor kButtonEnabledColor = SkColorSetRGB(0x22, 0x22, 0x22); |
| 36 static const SkColor kButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99); | 36 static const SkColor kButtonDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99); |
| 37 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0); | 37 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0); |
| 38 static const SkColor kButtonHoverColor = kButtonEnabledColor; | 38 static const SkColor kButtonHoverColor = kButtonEnabledColor; |
| 39 static const SkColor kButtonHoverBackgroundColor = | 39 static const SkColor kButtonHoverBackgroundColor = |
| 40 SkColorSetRGB(0xEA, 0xEA, 0xEA); | 40 SkColorSetRGB(0xEA, 0xEA, 0xEA); |
| 41 static const SkColor kCallToActionButtonEnabledColor = SK_ColorWHITE; | |
|
msw
2014/06/02 21:06:20
nit: one const or inlined values would suffice for
Evan Stade
2014/06/02 22:18:14
this follows the precedent set by the rest of this
| |
| 42 static const SkColor kCallToActionButtonDisabledColor = SK_ColorWHITE; | |
| 43 static const SkColor kCallToActionButtonHighlightColor = SK_ColorWHITE; | |
| 44 static const SkColor kCallToActionButtonHoverColor = SK_ColorWHITE; | |
| 41 // MenuItem: | 45 // MenuItem: |
| 42 static const SkColor kEnabledMenuItemForegroundColor = kButtonEnabledColor; | 46 static const SkColor kEnabledMenuItemForegroundColor = kButtonEnabledColor; |
| 43 static const SkColor kDisabledMenuItemForegroundColor = kButtonDisabledColor; | 47 static const SkColor kDisabledMenuItemForegroundColor = kButtonDisabledColor; |
| 44 static const SkColor kFocusedMenuItemBackgroundColor = | 48 static const SkColor kFocusedMenuItemBackgroundColor = |
| 45 SkColorSetRGB(0xF1, 0xF1, 0xF1); | 49 SkColorSetRGB(0xF1, 0xF1, 0xF1); |
| 46 static const SkColor kHoverMenuItemBackgroundColor = | 50 static const SkColor kHoverMenuItemBackgroundColor = |
| 47 SkColorSetARGB(204, 255, 255, 255); | 51 SkColorSetARGB(204, 255, 255, 255); |
| 48 static const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED); | 52 static const SkColor kMenuSeparatorColor = SkColorSetRGB(0xED, 0xED, 0xED); |
| 49 static const SkColor kEnabledMenuButtonBorderColor = | 53 static const SkColor kEnabledMenuButtonBorderColor = |
| 50 SkColorSetARGB(36, 0, 0, 0); | 54 SkColorSetARGB(36, 0, 0, 0); |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 case kColorId_ButtonEnabledColor: | 139 case kColorId_ButtonEnabledColor: |
| 136 return kButtonEnabledColor; | 140 return kButtonEnabledColor; |
| 137 case kColorId_ButtonDisabledColor: | 141 case kColorId_ButtonDisabledColor: |
| 138 return kButtonDisabledColor; | 142 return kButtonDisabledColor; |
| 139 case kColorId_ButtonHighlightColor: | 143 case kColorId_ButtonHighlightColor: |
| 140 return kButtonHighlightColor; | 144 return kButtonHighlightColor; |
| 141 case kColorId_ButtonHoverColor: | 145 case kColorId_ButtonHoverColor: |
| 142 return kButtonHoverColor; | 146 return kButtonHoverColor; |
| 143 case kColorId_ButtonHoverBackgroundColor: | 147 case kColorId_ButtonHoverBackgroundColor: |
| 144 return kButtonHoverBackgroundColor; | 148 return kButtonHoverBackgroundColor; |
| 149 case kColorId_CallToActionButtonEnabledColor: | |
| 150 return kCallToActionButtonEnabledColor; | |
| 151 case kColorId_CallToActionButtonDisabledColor: | |
| 152 return kCallToActionButtonDisabledColor; | |
| 153 case kColorId_CallToActionButtonHighlightColor: | |
| 154 return kCallToActionButtonHighlightColor; | |
| 155 case kColorId_CallToActionButtonHoverColor: | |
| 156 return kCallToActionButtonHoverColor; | |
| 145 | 157 |
| 146 // MenuItem | 158 // MenuItem |
| 147 case kColorId_EnabledMenuItemForegroundColor: | 159 case kColorId_EnabledMenuItemForegroundColor: |
| 148 return kEnabledMenuItemForegroundColor; | 160 return kEnabledMenuItemForegroundColor; |
| 149 case kColorId_DisabledMenuItemForegroundColor: | 161 case kColorId_DisabledMenuItemForegroundColor: |
| 150 return kDisabledMenuItemForegroundColor; | 162 return kDisabledMenuItemForegroundColor; |
| 151 case kColorId_DisabledEmphasizedMenuItemForegroundColor: | 163 case kColorId_DisabledEmphasizedMenuItemForegroundColor: |
| 152 return SK_ColorBLACK; | 164 return SK_ColorBLACK; |
| 153 case kColorId_SelectedMenuItemForegroundColor: | 165 case kColorId_SelectedMenuItemForegroundColor: |
| 154 return kEnabledMenuItemForegroundColor; | 166 return kEnabledMenuItemForegroundColor; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 256 return kMenuBackgroundColor; | 268 return kMenuBackgroundColor; |
| 257 case kColorId_MenuBorderColor: | 269 case kColorId_MenuBorderColor: |
| 258 NOTREACHED(); | 270 NOTREACHED(); |
| 259 break; | 271 break; |
| 260 } | 272 } |
| 261 | 273 |
| 262 return kInvalidColorIdColor; | 274 return kInvalidColorIdColor; |
| 263 } | 275 } |
| 264 | 276 |
| 265 } // namespace ui | 277 } // namespace ui |
| OLD | NEW |
