| 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/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  Loading... | 
| 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 spinner/throbber: | 42 // Material spinner/throbber: | 
| 43 const SkColor kThrobberSpinningColor = SkColorSetRGB(0x42, 0x81, 0xF4); | 43 const SkColor kThrobberSpinningColor = SkColorSetRGB(0x42, 0x85, 0xF4); | 
| 44 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); | 44 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); | 
| 45 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); | 45 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); | 
| 46 | 46 | 
| 47 }  // namespace | 47 }  // namespace | 
| 48 | 48 | 
| 49 namespace ui { | 49 namespace ui { | 
| 50 | 50 | 
| 51 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { | 51 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { | 
| 52   switch (color_id) { | 52   switch (color_id) { | 
| 53     // MenuItem | 53     // MenuItem | 
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 217 // static | 217 // static | 
| 218 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { | 218 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { | 
| 219   // TODO(pkotwicz): Do something better and don't infer device | 219   // TODO(pkotwicz): Do something better and don't infer device | 
| 220   // scale factor from canvas scale. | 220   // scale factor from canvas scale. | 
| 221   SkMatrix m = sk_canvas->getTotalMatrix(); | 221   SkMatrix m = sk_canvas->getTotalMatrix(); | 
| 222   float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); | 222   float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); | 
| 223   return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale)); | 223   return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale)); | 
| 224 } | 224 } | 
| 225 | 225 | 
| 226 }  // namespace ui | 226 }  // namespace ui | 
| OLD | NEW | 
|---|