| 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 21 matching lines...) Expand all  Loading... | 
|   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; |   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: | 
 |   43 const SkColor kGoogleBlue = SkColorSetRGB(0x42, 0x85, 0xF4); | 
 |   44 const SkColor kChromeIconGrey = SkColorSetRGB(0x5A, 0x5A, 0x5A); | 
|   42 // Material spinner/throbber: |   45 // Material spinner/throbber: | 
|   43 const SkColor kThrobberSpinningColor = SkColorSetRGB(0x42, 0x85, 0xF4); |  | 
|   44 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); |   46 const SkColor kThrobberWaitingColor = SkColorSetRGB(0xA6, 0xA6, 0xA6); | 
|   45 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); |   47 const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD); | 
|   46  |   48  | 
|   47 }  // namespace |   49 }  // namespace | 
|   48  |   50  | 
|   49 namespace ui { |   51 namespace ui { | 
|   50  |   52  | 
|   51 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { |   53 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { | 
|   52   switch (color_id) { |   54   switch (color_id) { | 
|   53     // MenuItem |   55     // MenuItem | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  102       break; |  104       break; | 
|  103     case NativeTheme::kColorId_BlueButtonPressedColor: |  105     case NativeTheme::kColorId_BlueButtonPressedColor: | 
|  104       *color = kBlueButtonPressedColor; |  106       *color = kBlueButtonPressedColor; | 
|  105       break; |  107       break; | 
|  106     case NativeTheme::kColorId_BlueButtonHoverColor: |  108     case NativeTheme::kColorId_BlueButtonHoverColor: | 
|  107       *color = kBlueButtonHoverColor; |  109       *color = kBlueButtonHoverColor; | 
|  108       break; |  110       break; | 
|  109     case NativeTheme::kColorId_BlueButtonShadowColor: |  111     case NativeTheme::kColorId_BlueButtonShadowColor: | 
|  110       *color = kBlueButtonShadowColor; |  112       *color = kBlueButtonShadowColor; | 
|  111       break; |  113       break; | 
 |  114     // Material icons | 
 |  115     case NativeTheme::kColorId_ChromeIconGrey: | 
 |  116       *color = kChromeIconGrey; | 
 |  117       break; | 
|  112     // Material spinner/throbber |  118     // Material spinner/throbber | 
|  113     case NativeTheme::kColorId_ThrobberSpinningColor: |  119     case NativeTheme::kColorId_ThrobberSpinningColor: | 
|  114       *color = kThrobberSpinningColor; |  120       *color = kGoogleBlue; | 
|  115       break; |  121       break; | 
|  116     case NativeTheme::kColorId_ThrobberWaitingColor: |  122     case NativeTheme::kColorId_ThrobberWaitingColor: | 
|  117       *color = kThrobberWaitingColor; |  123       *color = kThrobberWaitingColor; | 
|  118       break; |  124       break; | 
|  119     case NativeTheme::kColorId_ThrobberLightColor: |  125     case NativeTheme::kColorId_ThrobberLightColor: | 
|  120       *color = kThrobberLightColor; |  126       *color = kThrobberLightColor; | 
|  121       break; |  127       break; | 
|  122     default: |  128     default: | 
|  123       return false; |  129       return false; | 
|  124   } |  130   } | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  217 // static |  223 // static | 
|  218 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { |  224 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { | 
|  219   // TODO(pkotwicz): Do something better and don't infer device |  225   // TODO(pkotwicz): Do something better and don't infer device | 
|  220   // scale factor from canvas scale. |  226   // scale factor from canvas scale. | 
|  221   SkMatrix m = sk_canvas->getTotalMatrix(); |  227   SkMatrix m = sk_canvas->getTotalMatrix(); | 
|  222   float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); |  228   float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); | 
|  223   return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale)); |  229   return make_scoped_ptr(new gfx::Canvas(sk_canvas, device_scale)); | 
|  224 } |  230 } | 
|  225  |  231  | 
|  226 }  // namespace ui |  232 }  // namespace ui | 
| OLD | NEW |