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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/native_theme/native_theme_android.h ('k') | ui/native_theme/native_theme_aurawin.h » ('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) 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 #ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_H_ 5 #ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
6 #define UI_NATIVE_THEME_NATIVE_THEME_AURA_H_ 6 #define UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/native_theme/fallback_theme.h" 10 #include "ui/native_theme/fallback_theme.h"
(...skipping 10 matching lines...) Expand all
21 static NativeThemeAura* instance(); 21 static NativeThemeAura* instance();
22 22
23 protected: 23 protected:
24 NativeThemeAura(); 24 NativeThemeAura();
25 virtual ~NativeThemeAura(); 25 virtual ~NativeThemeAura();
26 26
27 // Overridden from NativeThemeBase: 27 // Overridden from NativeThemeBase:
28 virtual void PaintMenuPopupBackground( 28 virtual void PaintMenuPopupBackground(
29 SkCanvas* canvas, 29 SkCanvas* canvas,
30 const gfx::Size& size, 30 const gfx::Size& size,
31 const MenuBackgroundExtraParams& menu_background) const OVERRIDE; 31 const MenuBackgroundExtraParams& menu_background) const override;
32 virtual void PaintMenuItemBackground( 32 virtual void PaintMenuItemBackground(
33 SkCanvas* canvas, 33 SkCanvas* canvas,
34 State state, 34 State state,
35 const gfx::Rect& rect, 35 const gfx::Rect& rect,
36 const MenuListExtraParams& menu_list) const OVERRIDE; 36 const MenuListExtraParams& menu_list) const override;
37 virtual void PaintArrowButton(SkCanvas* gc, 37 virtual void PaintArrowButton(SkCanvas* gc,
38 const gfx::Rect& rect, 38 const gfx::Rect& rect,
39 Part direction, 39 Part direction,
40 State state) const OVERRIDE; 40 State state) const override;
41 virtual void PaintScrollbarTrack( 41 virtual void PaintScrollbarTrack(
42 SkCanvas* sk_canvas, 42 SkCanvas* sk_canvas,
43 Part part, 43 Part part,
44 State state, 44 State state,
45 const ScrollbarTrackExtraParams& extra_params, 45 const ScrollbarTrackExtraParams& extra_params,
46 const gfx::Rect& rect) const OVERRIDE; 46 const gfx::Rect& rect) const override;
47 virtual void PaintScrollbarThumb(SkCanvas* sk_canvas, 47 virtual void PaintScrollbarThumb(SkCanvas* sk_canvas,
48 Part part, 48 Part part,
49 State state, 49 State state,
50 const gfx::Rect& rect) const OVERRIDE; 50 const gfx::Rect& rect) const override;
51 virtual void PaintScrollbarCorner(SkCanvas* canvas, 51 virtual void PaintScrollbarCorner(SkCanvas* canvas,
52 State state, 52 State state,
53 const gfx::Rect& rect) const OVERRIDE; 53 const gfx::Rect& rect) const override;
54 54
55 virtual void PaintScrollbarThumbStateTransition(SkCanvas* canvas, 55 virtual void PaintScrollbarThumbStateTransition(SkCanvas* canvas,
56 State startState, 56 State startState,
57 State endState, 57 State endState,
58 double progress, 58 double progress,
59 const gfx::Rect& rect) const 59 const gfx::Rect& rect) const
60 OVERRIDE; 60 override;
61 61
62 // Returns the NineImagePainter used to paint the specified state, creating if 62 // Returns the NineImagePainter used to paint the specified state, creating if
63 // necessary. If no image is provided for the specified state the normal state 63 // necessary. If no image is provided for the specified state the normal state
64 // images are used. 64 // images are used.
65 gfx::NineImagePainter* GetOrCreatePainter( 65 gfx::NineImagePainter* GetOrCreatePainter(
66 const int image_ids[kNumStates][9], 66 const int image_ids[kNumStates][9],
67 State state, 67 State state,
68 scoped_ptr<gfx::NineImagePainter> painters[kNumStates]) const; 68 scoped_ptr<gfx::NineImagePainter> painters[kNumStates]) const;
69 69
70 // Paints |painter| into the canvas using |rect|. 70 // Paints |painter| into the canvas using |rect|.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 double progress) const; 120 double progress) const;
121 121
122 mutable scoped_ptr<DualPainter> scrollbar_overlay_thumb_painter_; 122 mutable scoped_ptr<DualPainter> scrollbar_overlay_thumb_painter_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(NativeThemeAura); 124 DISALLOW_COPY_AND_ASSIGN(NativeThemeAura);
125 }; 125 };
126 126
127 } // namespace ui 127 } // namespace ui
128 128
129 #endif // UI_NATIVE_THEME_NATIVE_THEME_AURA_H_ 129 #endif // UI_NATIVE_THEME_NATIVE_THEME_AURA_H_
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_android.h ('k') | ui/native_theme/native_theme_aurawin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698