| 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/gfx/native_theme_aura.h" | 5 #include "ui/gfx/native_theme_aura.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "grit/gfx_resources.h" | 9 #include "grit/gfx_resources.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 // MenuItem: | 31 // MenuItem: |
| 32 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; | 32 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; |
| 33 const SkColor kDisabledMenuItemForegroundColor = | 33 const SkColor kDisabledMenuItemForegroundColor = |
| 34 SkColorSetRGB(0x80, 0x80, 0x80); | 34 SkColorSetRGB(0x80, 0x80, 0x80); |
| 35 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); | 35 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); |
| 36 // Textfield: | 36 // Textfield: |
| 37 const SkColor kTextfieldDefaultColor = SK_ColorBLACK; | 37 const SkColor kTextfieldDefaultColor = SK_ColorBLACK; |
| 38 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; | 38 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; |
| 39 const SkColor kTextfieldSelectionColor = SK_ColorWHITE; | 39 const SkColor kTextfieldSelectionColor = SK_ColorWHITE; |
| 40 const SkColor kTextfieldSelectionBackgroundFocused = | 40 const SkColor kTextfieldSelectionBackgroundFocused = |
| 41 SkColorSetRGB(0x1D, 0x90, 0xFF); | 41 SkColorSetARGB(0x54, 0x4D, 0x90, 0xFE); |
| 42 const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY; | 42 const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY; |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 | 45 |
| 46 namespace gfx { | 46 namespace gfx { |
| 47 | 47 |
| 48 // static | 48 // static |
| 49 const NativeTheme* NativeTheme::instance() { | 49 const NativeTheme* NativeTheme::instance() { |
| 50 return NativeThemeAura::instance(); | 50 return NativeThemeAura::instance(); |
| 51 } | 51 } |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap); | 250 SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap); |
| 251 SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap); | 251 SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap); |
| 252 | 252 |
| 253 horizontal_bitmaps_[resource_id] = horizontal_bitmap; | 253 horizontal_bitmaps_[resource_id] = horizontal_bitmap; |
| 254 return horizontal_bitmap; | 254 return horizontal_bitmap; |
| 255 } | 255 } |
| 256 return NULL; | 256 return NULL; |
| 257 } | 257 } |
| 258 | 258 |
| 259 } // namespace gfx | 259 } // namespace gfx |
| OLD | NEW |