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

Side by Side Diff: ash/wm/panels/panel_frame_view.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/wm/panels/attached_panel_window_targeter.h ('k') | ash/wm/panels/panel_layout_manager.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 ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 5 #ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 14 matching lines...) Expand all
25 25
26 enum FrameType { 26 enum FrameType {
27 FRAME_NONE, 27 FRAME_NONE,
28 FRAME_ASH 28 FRAME_ASH
29 }; 29 };
30 30
31 PanelFrameView(views::Widget* frame, FrameType frame_type); 31 PanelFrameView(views::Widget* frame, FrameType frame_type);
32 virtual ~PanelFrameView(); 32 virtual ~PanelFrameView();
33 33
34 // Overridden from views::View: 34 // Overridden from views::View:
35 virtual const char* GetClassName() const OVERRIDE; 35 virtual const char* GetClassName() const override;
36 36
37 private: 37 private:
38 void InitHeaderPainter(); 38 void InitHeaderPainter();
39 39
40 // Height from top of window to top of client area. 40 // Height from top of window to top of client area.
41 int NonClientTopBorderHeight() const; 41 int NonClientTopBorderHeight() const;
42 42
43 // Overridden from views::NonClientFrameView: 43 // Overridden from views::NonClientFrameView:
44 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 44 virtual gfx::Rect GetBoundsForClientView() const override;
45 virtual gfx::Rect GetWindowBoundsForClientBounds( 45 virtual gfx::Rect GetWindowBoundsForClientBounds(
46 const gfx::Rect& client_bounds) const OVERRIDE; 46 const gfx::Rect& client_bounds) const override;
47 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 47 virtual int NonClientHitTest(const gfx::Point& point) override;
48 virtual void GetWindowMask(const gfx::Size& size, 48 virtual void GetWindowMask(const gfx::Size& size,
49 gfx::Path* window_mask) OVERRIDE; 49 gfx::Path* window_mask) override;
50 virtual void ResetWindowControls() OVERRIDE; 50 virtual void ResetWindowControls() override;
51 virtual void UpdateWindowIcon() OVERRIDE; 51 virtual void UpdateWindowIcon() override;
52 virtual void UpdateWindowTitle() OVERRIDE; 52 virtual void UpdateWindowTitle() override;
53 virtual void SizeConstraintsChanged() OVERRIDE; 53 virtual void SizeConstraintsChanged() override;
54 54
55 // Overridden from views::View: 55 // Overridden from views::View:
56 virtual gfx::Size GetMinimumSize() const OVERRIDE; 56 virtual gfx::Size GetMinimumSize() const override;
57 virtual void Layout() OVERRIDE; 57 virtual void Layout() override;
58 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 58 virtual void OnPaint(gfx::Canvas* canvas) override;
59 59
60 // Child View class describing the panel's title bar behavior 60 // Child View class describing the panel's title bar behavior
61 // and buttons, owned by the view hierarchy 61 // and buttons, owned by the view hierarchy
62 views::Widget* frame_; 62 views::Widget* frame_;
63 FrameCaptionButtonContainerView* caption_button_container_; 63 FrameCaptionButtonContainerView* caption_button_container_;
64 views::ImageView* window_icon_; 64 views::ImageView* window_icon_;
65 gfx::Rect client_view_bounds_; 65 gfx::Rect client_view_bounds_;
66 66
67 // Helper class for painting the header. 67 // Helper class for painting the header.
68 scoped_ptr<DefaultHeaderPainter> header_painter_; 68 scoped_ptr<DefaultHeaderPainter> header_painter_;
69 69
70 // Updates the hittest bounds overrides based on the window state type. 70 // Updates the hittest bounds overrides based on the window state type.
71 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 71 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(PanelFrameView); 73 DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
74 }; 74 };
75 75
76 } 76 }
77 77
78 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 78 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « ash/wm/panels/attached_panel_window_targeter.h ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698