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

Side by Side Diff: athena/main/athena_frame_view.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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 | « athena/main/athena_content_client.h ('k') | athena/main/athena_launcher.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 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 ATHENA_COMMON_ATHENA_FRAME_VIEW_H_ 5 #ifndef ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
6 #define ATHENA_COMMON_ATHENA_FRAME_VIEW_H_ 6 #define ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
7 7
8 #include "ui/views/window/non_client_view.h" 8 #include "ui/views/window/non_client_view.h"
9 9
10 namespace views { 10 namespace views {
11 class Widget; 11 class Widget;
12 } 12 }
13 13
14 namespace athena { 14 namespace athena {
15 15
16 // A NonClientFrameView used for non activity window. 16 // A NonClientFrameView used for non activity window.
17 // TODO(oshima): Move this to athena/util and share the code. 17 // TODO(oshima): Move this to athena/util and share the code.
18 class AthenaFrameView : public views::NonClientFrameView { 18 class AthenaFrameView : public views::NonClientFrameView {
19 public: 19 public:
20 // The frame class name. 20 // The frame class name.
21 static const char kViewClassName[]; 21 static const char kViewClassName[];
22 22
23 explicit AthenaFrameView(views::Widget* frame); 23 explicit AthenaFrameView(views::Widget* frame);
24 virtual ~AthenaFrameView(); 24 virtual ~AthenaFrameView();
25 25
26 // views::NonClientFrameView overrides: 26 // views::NonClientFrameView overrides:
27 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 27 virtual gfx::Rect GetBoundsForClientView() const override;
28 virtual gfx::Rect GetWindowBoundsForClientBounds( 28 virtual gfx::Rect GetWindowBoundsForClientBounds(
29 const gfx::Rect& client_bounds) const OVERRIDE; 29 const gfx::Rect& client_bounds) const override;
30 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 30 virtual int NonClientHitTest(const gfx::Point& point) override;
31 virtual void GetWindowMask(const gfx::Size& size, 31 virtual void GetWindowMask(const gfx::Size& size,
32 gfx::Path* window_mask) OVERRIDE {} 32 gfx::Path* window_mask) override {}
33 virtual void ResetWindowControls() OVERRIDE {} 33 virtual void ResetWindowControls() override {}
34 virtual void UpdateWindowIcon() OVERRIDE {} 34 virtual void UpdateWindowIcon() override {}
35 virtual void UpdateWindowTitle() OVERRIDE {} 35 virtual void UpdateWindowTitle() override {}
36 virtual void SizeConstraintsChanged() OVERRIDE {} 36 virtual void SizeConstraintsChanged() override {}
37 37
38 // views::View overrides: 38 // views::View overrides:
39 virtual gfx::Size GetPreferredSize() const OVERRIDE; 39 virtual gfx::Size GetPreferredSize() const override;
40 virtual const char* GetClassName() const OVERRIDE; 40 virtual const char* GetClassName() const override;
41 virtual void Layout() OVERRIDE {} 41 virtual void Layout() override {}
42 42
43 private: 43 private:
44 gfx::Insets NonClientBorderInsets() const; 44 gfx::Insets NonClientBorderInsets() const;
45 45
46 virtual int NonClientTopBorderHeight() const; 46 virtual int NonClientTopBorderHeight() const;
47 virtual int NonClientBorderThickness() const; 47 virtual int NonClientBorderThickness() const;
48 48
49 // Not owned. 49 // Not owned.
50 views::Widget* frame_; 50 views::Widget* frame_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(AthenaFrameView); 52 DISALLOW_COPY_AND_ASSIGN(AthenaFrameView);
53 }; 53 };
54 54
55 } // namespace athena 55 } // namespace athena
56 56
57 #endif // ATHENA_COMMON_ATHENA_FRAME_VIEW_H_ 57 #endif // ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « athena/main/athena_content_client.h ('k') | athena/main/athena_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698