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

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

Issue 235833002: [Mac] Redesign the avatar bubble UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittest broken by rebase Created 6 years, 8 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
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 14 matching lines...) Expand all
25 SkColorSetRGB(48, 48, 48); 25 SkColorSetRGB(48, 48, 48);
26 const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); 26 const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
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:
36 const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
35 37
36 } // namespace 38 } // namespace
37 39
38 namespace ui { 40 namespace ui {
39 41
40 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { 42 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) {
41 switch (color_id) { 43 switch (color_id) {
42 // MenuItem 44 // MenuItem
43 case NativeTheme::kColorId_MenuBorderColor: 45 case NativeTheme::kColorId_MenuBorderColor:
44 *color = kMenuBorderColor; 46 *color = kMenuBorderColor;
(...skipping 27 matching lines...) Expand all
72 break; 74 break;
73 case NativeTheme::kColorId_DisabledEmphasizedMenuItemForegroundColor: 75 case NativeTheme::kColorId_DisabledEmphasizedMenuItemForegroundColor:
74 *color = SK_ColorBLACK; 76 *color = SK_ColorBLACK;
75 break; 77 break;
76 case NativeTheme::kColorId_SelectedMenuItemForegroundColor: 78 case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
77 *color = SK_ColorWHITE; 79 *color = SK_ColorWHITE;
78 break; 80 break;
79 case NativeTheme::kColorId_ButtonDisabledColor: 81 case NativeTheme::kColorId_ButtonDisabledColor:
80 *color = kDisabledMenuItemForegroundColor; 82 *color = kDisabledMenuItemForegroundColor;
81 break; 83 break;
84 // Button
85 case NativeTheme::kColorId_ButtonHoverBackgroundColor:
86 *color = kButtonHoverBackgroundColor;
87 break;
82 default: 88 default:
83 return false; 89 return false;
84 } 90 }
85 91
86 if (gfx::IsInvertedColorScheme()) { 92 if (gfx::IsInvertedColorScheme()) {
87 switch (color_id) { 93 switch (color_id) {
88 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: 94 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
89 *color = kMenuInvertedSchemeHighlightBackgroundColor; 95 *color = kMenuInvertedSchemeHighlightBackgroundColor;
90 break; 96 break;
91 default: 97 default:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 paint.setColor(color); 167 paint.setColor(color);
162 break; 168 break;
163 default: 169 default:
164 NOTREACHED() << "Invalid state " << state; 170 NOTREACHED() << "Invalid state " << state;
165 break; 171 break;
166 } 172 }
167 canvas->drawRect(gfx::RectToSkRect(rect), paint); 173 canvas->drawRect(gfx::RectToSkRect(rect), paint);
168 } 174 }
169 175
170 } // namespace ui 176 } // namespace ui
OLDNEW
« no previous file with comments | « components/signin/core/common/profile_management_switches.cc ('k') | ui/native_theme/fallback_theme.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698