| 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/native_theme_aura.h" | 5 #include "ui/native_theme/native_theme_aura.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "ui/base/layout.h" | 10 #include "ui/base/layout.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 const int kScrollbarOverlayThumbFillImages[9] = | 64 const int kScrollbarOverlayThumbFillImages[9] = |
| 65 IMAGE_GRID(IDR_SCROLLBAR_OVERLAY_THUMB_FILL); | 65 IMAGE_GRID(IDR_SCROLLBAR_OVERLAY_THUMB_FILL); |
| 66 | 66 |
| 67 const int kScrollbarTrackImages[9] = IMAGE_GRID(IDR_SCROLLBAR_BASE); | 67 const int kScrollbarTrackImages[9] = IMAGE_GRID(IDR_SCROLLBAR_BASE); |
| 68 | 68 |
| 69 } // namespace | 69 } // namespace |
| 70 | 70 |
| 71 #if !defined(OS_WIN) | 71 #if !defined(OS_WIN) |
| 72 // static | 72 // static |
| 73 NativeTheme* NativeTheme::instance() { | 73 NativeTheme* NativeTheme::GetInstanceForWeb() { |
| 74 return NativeThemeAura::instance(); | 74 return NativeThemeAura::instance(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 // static | 77 // static |
| 78 NativeThemeAura* NativeThemeAura::instance() { | 78 NativeThemeAura* NativeThemeAura::instance() { |
| 79 CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ()); | 79 CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ()); |
| 80 return &s_native_theme; | 80 return &s_native_theme; |
| 81 } | 81 } |
| 82 #endif | 82 #endif |
| 83 | 83 |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 scoped_ptr<NineImagePainter> stroke_painter, | 614 scoped_ptr<NineImagePainter> stroke_painter, |
| 615 const uint8 stroke_alphas[kNumStates]) | 615 const uint8 stroke_alphas[kNumStates]) |
| 616 : fill_painter(fill_painter.Pass()), | 616 : fill_painter(fill_painter.Pass()), |
| 617 fill_alphas(fill_alphas), | 617 fill_alphas(fill_alphas), |
| 618 stroke_painter(stroke_painter.Pass()), | 618 stroke_painter(stroke_painter.Pass()), |
| 619 stroke_alphas(stroke_alphas) {} | 619 stroke_alphas(stroke_alphas) {} |
| 620 | 620 |
| 621 NativeThemeAura::DualPainter::~DualPainter() {} | 621 NativeThemeAura::DualPainter::~DualPainter() {} |
| 622 | 622 |
| 623 } // namespace ui | 623 } // namespace ui |
| OLD | NEW |