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

Side by Side Diff: ui/gfx/native_theme_aura.h

Issue 9151011: Revert 116894 - Factor more colors into NativeTheme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/native_theme.h ('k') | ui/gfx/native_theme_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef UI_GFX_NATIVE_THEME_AURA_H_ 5 #ifndef UI_GFX_NATIVE_THEME_AURA_H_
6 #define UI_GFX_NATIVE_THEME_AURA_H_ 6 #define UI_GFX_NATIVE_THEME_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "ui/gfx/native_theme_base.h" 12 #include "ui/gfx/native_theme_base.h"
13 #include "ui/gfx/rect.h" 13 #include "ui/gfx/rect.h"
14 14
15 class SkBitmap; 15 class SkBitmap;
16 16
17 namespace gfx { 17 namespace gfx {
18 18
19 // Aura implementation of native theme support. 19 // Aura implementation of native theme support.
20 class NativeThemeAura : public NativeThemeBase { 20 class NativeThemeAura : public NativeThemeBase {
21 public: 21 public:
22 static const NativeThemeAura* instance(); 22 static const NativeThemeAura* instance();
23 23
24 private: 24 private:
25 NativeThemeAura(); 25 NativeThemeAura();
26 virtual ~NativeThemeAura(); 26 virtual ~NativeThemeAura();
27 27
28 // NativeTheme overrides
29 virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE;
30
31 // NativeThemeBase overrides 28 // NativeThemeBase overrides
32 virtual void PaintMenuPopupBackground( 29 virtual void PaintMenuPopupBackground(
33 SkCanvas* canvas, 30 SkCanvas* canvas,
34 State state, 31 State state,
35 const gfx::Rect& rect, 32 const gfx::Rect& rect,
36 const MenuListExtraParams& menu_list) const OVERRIDE; 33 const MenuListExtraParams& menu_list) const OVERRIDE;
37 34
38 virtual void PaintScrollbarTrack( 35 virtual void PaintScrollbarTrack(
39 SkCanvas* canvas, 36 SkCanvas* canvas,
40 Part part, 37 Part part,
(...skipping 19 matching lines...) Expand all
60 // ownership of the pointers. 57 // ownership of the pointers.
61 typedef std::map<int, SkBitmap*> SkImageMap; 58 typedef std::map<int, SkBitmap*> SkImageMap;
62 mutable SkImageMap horizontal_bitmaps_; 59 mutable SkImageMap horizontal_bitmaps_;
63 60
64 DISALLOW_COPY_AND_ASSIGN(NativeThemeAura); 61 DISALLOW_COPY_AND_ASSIGN(NativeThemeAura);
65 }; 62 };
66 63
67 } // namespace gfx 64 } // namespace gfx
68 65
69 #endif // UI_GFX_NATIVE_THEME_AURA_H_ 66 #endif // UI_GFX_NATIVE_THEME_AURA_H_
OLDNEW
« no previous file with comments | « ui/gfx/native_theme.h ('k') | ui/gfx/native_theme_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698