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

Side by Side Diff: chrome/browser/ui/views/frame/browser_header_painter_ash.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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
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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
7 7
8 #include "ash/frame/header_painter.h" 8 #include "ash/frame/header_painter.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" // OVERRIDE 10 #include "base/compiler_specific.h" // override
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/gfx/animation/animation_delegate.h" 12 #include "ui/gfx/animation/animation_delegate.h"
13 13
14 class BrowserView; 14 class BrowserView;
15 15
16 namespace ash { 16 namespace ash {
17 class FrameCaptionButtonContainerView; 17 class FrameCaptionButtonContainerView;
18 } 18 }
19 19
20 namespace gfx { 20 namespace gfx {
(...skipping 15 matching lines...) Expand all
36 36
37 // BrowserHeaderPainterAsh does not take ownership of any of the parameters. 37 // BrowserHeaderPainterAsh does not take ownership of any of the parameters.
38 void Init( 38 void Init(
39 views::Widget* frame, 39 views::Widget* frame,
40 BrowserView* browser_view, 40 BrowserView* browser_view,
41 views::View* header_view, 41 views::View* header_view,
42 views::View* window_icon, 42 views::View* window_icon,
43 ash::FrameCaptionButtonContainerView* caption_button_container); 43 ash::FrameCaptionButtonContainerView* caption_button_container);
44 44
45 // ash::HeaderPainter overrides: 45 // ash::HeaderPainter overrides:
46 virtual int GetMinimumHeaderWidth() const OVERRIDE; 46 virtual int GetMinimumHeaderWidth() const override;
47 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) OVERRIDE; 47 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
48 virtual void LayoutHeader() OVERRIDE; 48 virtual void LayoutHeader() override;
49 virtual int GetHeaderHeightForPainting() const OVERRIDE; 49 virtual int GetHeaderHeightForPainting() const override;
50 virtual void SetHeaderHeightForPainting(int height) OVERRIDE; 50 virtual void SetHeaderHeightForPainting(int height) override;
51 virtual void SchedulePaintForTitle() OVERRIDE; 51 virtual void SchedulePaintForTitle() override;
52 virtual void UpdateLeftViewXInset(int left_view_x_inset) OVERRIDE; 52 virtual void UpdateLeftViewXInset(int left_view_x_inset) override;
53 53
54 private: 54 private:
55 // gfx::AnimationDelegate override: 55 // gfx::AnimationDelegate override:
56 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 56 virtual void AnimationProgressed(const gfx::Animation* animation) override;
57 57
58 // Paints highlight around the edge of the header for restored windows. 58 // Paints highlight around the edge of the header for restored windows.
59 void PaintHighlightForRestoredWindow(gfx::Canvas* canvas); 59 void PaintHighlightForRestoredWindow(gfx::Canvas* canvas);
60 60
61 // Paints the title bar, primarily the title string. 61 // Paints the title bar, primarily the title string.
62 void PaintTitleBar(gfx::Canvas* canvas); 62 void PaintTitleBar(gfx::Canvas* canvas);
63 63
64 // Sets |frame_image| and |frame_overlay_image| to the frame image and the 64 // Sets |frame_image| and |frame_overlay_image| to the frame image and the
65 // frame overlay image respectivately which should be used to paint the 65 // frame overlay image respectivately which should be used to paint the
66 // header. 66 // header.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 // Whether the header should be painted as active. 113 // Whether the header should be painted as active.
114 Mode mode_; 114 Mode mode_;
115 115
116 scoped_ptr<gfx::SlideAnimation> activation_animation_; 116 scoped_ptr<gfx::SlideAnimation> activation_animation_;
117 117
118 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh); 118 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh);
119 }; 119 };
120 120
121 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 121 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_ashwin.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698