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

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

Issue 288983010: fix text color of BlueButton on GTK-theme-mode Linux Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add colors to common theme Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc ('k') | ui/native_theme/fallback_theme.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 (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/common_theme.h" 5 #include "ui/native_theme/common_theme.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 16 matching lines...) Expand all
27 const SkColor kEnabledMenuButtonBorderColor = SkColorSetARGB(36, 0, 0, 0); 27 const SkColor kEnabledMenuButtonBorderColor = SkColorSetARGB(36, 0, 0, 0);
28 const SkColor kFocusedMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0); 28 const SkColor kFocusedMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0);
29 const SkColor kHoverMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0); 29 const SkColor kHoverMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0);
30 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9); 30 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9);
31 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; 31 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK;
32 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146); 32 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146);
33 const SkColor kHoverMenuItemBackgroundColor = 33 const SkColor kHoverMenuItemBackgroundColor =
34 SkColorSetARGB(204, 255, 255, 255); 34 SkColorSetARGB(204, 255, 255, 255);
35 // Button: 35 // Button:
36 const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA); 36 const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
37 const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
38 const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;
39 const SkColor kBlueButtonHighlightColor = SK_ColorWHITE;
40 const SkColor kBlueButtonHoverColor = SK_ColorWHITE;
37 41
38 } // namespace 42 } // namespace
39 43
40 namespace ui { 44 namespace ui {
41 45
42 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { 46 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) {
43 switch (color_id) { 47 switch (color_id) {
44 // MenuItem 48 // MenuItem
45 case NativeTheme::kColorId_MenuBorderColor: 49 case NativeTheme::kColorId_MenuBorderColor:
46 *color = kMenuBorderColor; 50 *color = kMenuBorderColor;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 case NativeTheme::kColorId_SelectedMenuItemForegroundColor: 82 case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
79 *color = SK_ColorWHITE; 83 *color = SK_ColorWHITE;
80 break; 84 break;
81 case NativeTheme::kColorId_ButtonDisabledColor: 85 case NativeTheme::kColorId_ButtonDisabledColor:
82 *color = kDisabledMenuItemForegroundColor; 86 *color = kDisabledMenuItemForegroundColor;
83 break; 87 break;
84 // Button 88 // Button
85 case NativeTheme::kColorId_ButtonHoverBackgroundColor: 89 case NativeTheme::kColorId_ButtonHoverBackgroundColor:
86 *color = kButtonHoverBackgroundColor; 90 *color = kButtonHoverBackgroundColor;
87 break; 91 break;
92 case NativeTheme::kColorId_BlueButtonEnabledColor:
93 *color = kBlueButtonEnabledColor;
94 break;
95 case NativeTheme::kColorId_BlueButtonDisabledColor:
96 *color = kBlueButtonDisabledColor;
97 break;
98 case NativeTheme::kColorId_BlueButtonHighlightColor:
99 *color = kBlueButtonHighlightColor;
100 break;
101 case NativeTheme::kColorId_BlueButtonHoverColor:
102 *color = kBlueButtonHoverColor;
103 break;
88 default: 104 default:
89 return false; 105 return false;
90 } 106 }
91 107
92 if (gfx::IsInvertedColorScheme()) { 108 if (gfx::IsInvertedColorScheme()) {
93 switch (color_id) { 109 switch (color_id) {
94 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: 110 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
95 *color = kMenuInvertedSchemeHighlightBackgroundColor; 111 *color = kMenuInvertedSchemeHighlightBackgroundColor;
96 break; 112 break;
97 default: 113 default:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 paint.setColor(color); 183 paint.setColor(color);
168 break; 184 break;
169 default: 185 default:
170 NOTREACHED() << "Invalid state " << state; 186 NOTREACHED() << "Invalid state " << state;
171 break; 187 break;
172 } 188 }
173 canvas->drawRect(gfx::RectToSkRect(rect), paint); 189 canvas->drawRect(gfx::RectToSkRect(rect), paint);
174 } 190 }
175 191
176 } // namespace ui 192 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc ('k') | ui/native_theme/fallback_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698