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

Side by Side Diff: ash/frame/default_header_painter.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/gpu_support_stub.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 5 #ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
6 #define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 6 #define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/frame/header_painter.h" 9 #include "ash/frame/header_painter.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" // OVERRIDE 11 #include "base/compiler_specific.h" // override
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/gfx/animation/animation_delegate.h" 15 #include "ui/gfx/animation/animation_delegate.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 class ImageSkia; 18 class ImageSkia;
19 class Rect; 19 class Rect;
20 class SlideAnimation; 20 class SlideAnimation;
21 } 21 }
(...skipping 11 matching lines...) Expand all
33 public: 33 public:
34 DefaultHeaderPainter(); 34 DefaultHeaderPainter();
35 virtual ~DefaultHeaderPainter(); 35 virtual ~DefaultHeaderPainter();
36 36
37 // DefaultHeaderPainter does not take ownership of any of the parameters. 37 // DefaultHeaderPainter does not take ownership of any of the parameters.
38 void Init(views::Widget* frame, 38 void Init(views::Widget* frame,
39 views::View* header_view, 39 views::View* header_view,
40 FrameCaptionButtonContainerView* caption_button_container); 40 FrameCaptionButtonContainerView* caption_button_container);
41 41
42 // HeaderPainter overrides: 42 // HeaderPainter overrides:
43 virtual int GetMinimumHeaderWidth() const OVERRIDE; 43 virtual int GetMinimumHeaderWidth() const override;
44 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) OVERRIDE; 44 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
45 virtual void LayoutHeader() OVERRIDE; 45 virtual void LayoutHeader() override;
46 virtual int GetHeaderHeightForPainting() const OVERRIDE; 46 virtual int GetHeaderHeightForPainting() const override;
47 virtual void SetHeaderHeightForPainting(int height) OVERRIDE; 47 virtual void SetHeaderHeightForPainting(int height) override;
48 virtual void SchedulePaintForTitle() OVERRIDE; 48 virtual void SchedulePaintForTitle() override;
49 virtual void UpdateLeftViewXInset(int left_view_x_inset) OVERRIDE; 49 virtual void UpdateLeftViewXInset(int left_view_x_inset) override;
50 50
51 // Sets the left header view for the header. Passing NULL removes the view. 51 // Sets the left header view for the header. Passing NULL removes the view.
52 void UpdateLeftHeaderView(views::View* left_header_view); 52 void UpdateLeftHeaderView(views::View* left_header_view);
53 53
54 private: 54 private:
55 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment); 55 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
56 56
57 // gfx::AnimationDelegate override: 57 // gfx::AnimationDelegate override:
58 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 58 virtual void AnimationProgressed(const gfx::Animation* animation) override;
59 59
60 // Paints highlight around the edge of the header for inactive restored 60 // Paints highlight around the edge of the header for inactive restored
61 // windows. 61 // windows.
62 void PaintHighlightForInactiveRestoredWindow(gfx::Canvas* canvas); 62 void PaintHighlightForInactiveRestoredWindow(gfx::Canvas* canvas);
63 63
64 // Paints the title bar, primarily the title string. 64 // Paints the title bar, primarily the title string.
65 void PaintTitleBar(gfx::Canvas* canvas); 65 void PaintTitleBar(gfx::Canvas* canvas);
66 66
67 // Paints the header/content separator. 67 // Paints the header/content separator.
68 void PaintHeaderContentSeparator(gfx::Canvas* canvas); 68 void PaintHeaderContentSeparator(gfx::Canvas* canvas);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 bool initial_paint_; 100 bool initial_paint_;
101 101
102 scoped_ptr<gfx::SlideAnimation> activation_animation_; 102 scoped_ptr<gfx::SlideAnimation> activation_animation_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter); 104 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
105 }; 105 };
106 106
107 } // namespace ash 107 } // namespace ash
108 108
109 #endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 109 #endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
OLDNEW
« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/gpu_support_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698