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

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

Issue 1289413003: Switch global error menu icon to vectorized MD asset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: kick signin error service on mac Created 5 years, 3 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
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 "third_party/skia/include/core/SkCanvas.h" 8 #include "third_party/skia/include/core/SkCanvas.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 22 matching lines...) Expand all
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; 37 const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
38 const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; 38 const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;
39 const SkColor kBlueButtonPressedColor = SK_ColorWHITE; 39 const SkColor kBlueButtonPressedColor = SK_ColorWHITE;
40 const SkColor kBlueButtonHoverColor = SK_ColorWHITE; 40 const SkColor kBlueButtonHoverColor = SK_ColorWHITE;
41 const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA); 41 const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA);
42 // Material colors: 42 // Material colors:
43 const SkColor kAmber = SkColorSetRGB(0xFF, 0xC1, 0x07);
43 const SkColor kGoogleBlue = SkColorSetRGB(0x42, 0x85, 0xF4); 44 const SkColor kGoogleBlue = SkColorSetRGB(0x42, 0x85, 0xF4);
44 const SkColor kChromeIconGrey = SkColorSetRGB(0x5A, 0x5A, 0x5A); 45 const SkColor kChromeIconGrey = SkColorSetRGB(0x5A, 0x5A, 0x5A);
45 // Material spinner/throbber: 46 // Material spinner/throbber:
46 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); 47 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6);
47 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); 48 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD);
48 49
49 } // namespace 50 } // namespace
50 51
51 namespace ui { 52 namespace ui {
52 53
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 case NativeTheme::kColorId_BlueButtonPressedColor: 106 case NativeTheme::kColorId_BlueButtonPressedColor:
106 *color = kBlueButtonPressedColor; 107 *color = kBlueButtonPressedColor;
107 break; 108 break;
108 case NativeTheme::kColorId_BlueButtonHoverColor: 109 case NativeTheme::kColorId_BlueButtonHoverColor:
109 *color = kBlueButtonHoverColor; 110 *color = kBlueButtonHoverColor;
110 break; 111 break;
111 case NativeTheme::kColorId_BlueButtonShadowColor: 112 case NativeTheme::kColorId_BlueButtonShadowColor:
112 *color = kBlueButtonShadowColor; 113 *color = kBlueButtonShadowColor;
113 break; 114 break;
114 // Material icons 115 // Material icons
116 case NativeTheme::kColorId_Amber:
117 *color = kAmber;
118 break;
115 case NativeTheme::kColorId_ChromeIconGrey: 119 case NativeTheme::kColorId_ChromeIconGrey:
116 *color = kChromeIconGrey; 120 *color = kChromeIconGrey;
117 break; 121 break;
118 case NativeTheme::kColorId_GoogleBlue: 122 case NativeTheme::kColorId_GoogleBlue:
119 *color = kGoogleBlue; 123 *color = kGoogleBlue;
120 break; 124 break;
121 // Material spinner/throbber 125 // Material spinner/throbber
122 case NativeTheme::kColorId_ThrobberSpinningColor: 126 case NativeTheme::kColorId_ThrobberSpinningColor:
123 *color = kGoogleBlue; 127 *color = kGoogleBlue;
124 break; 128 break;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // static 230 // static
227 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { 231 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) {
228 // TODO(pkotwicz): Do something better and don't infer device 232 // TODO(pkotwicz): Do something better and don't infer device
229 // scale factor from canvas scale. 233 // scale factor from canvas scale.
230 SkMatrix m = sk_canvas->getTotalMatrix(); 234 SkMatrix m = sk_canvas->getTotalMatrix();
231 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); 235 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX()));
232 return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale)); 236 return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale));
233 } 237 }
234 238
235 } // namespace ui 239 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698