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

Side by Side Diff: ash/shell/toplevel_window.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/shell/shell_delegate_impl.cc ('k') | ash/shell/widgets.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 (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_SHELL_TOPLEVEL_WINDOW_H_ 5 #ifndef ASH_SHELL_TOPLEVEL_WINDOW_H_
6 #define ASH_SHELL_TOPLEVEL_WINDOW_H_ 6 #define ASH_SHELL_TOPLEVEL_WINDOW_H_
7 7
8 #include "ui/views/widget/widget_delegate.h" 8 #include "ui/views/widget/widget_delegate.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 12 matching lines...) Expand all
23 23
24 // Clears saved show state and bounds used to position 24 // Clears saved show state and bounds used to position
25 // a new window. 25 // a new window.
26 static void ClearSavedStateForTest(); 26 static void ClearSavedStateForTest();
27 27
28 private: 28 private:
29 explicit ToplevelWindow(const CreateParams& params); 29 explicit ToplevelWindow(const CreateParams& params);
30 virtual ~ToplevelWindow(); 30 virtual ~ToplevelWindow();
31 31
32 // Overridden from views::View: 32 // Overridden from views::View:
33 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 33 virtual void OnPaint(gfx::Canvas* canvas) override;
34 34
35 // Overridden from views::WidgetDelegate: 35 // Overridden from views::WidgetDelegate:
36 virtual base::string16 GetWindowTitle() const OVERRIDE; 36 virtual base::string16 GetWindowTitle() const override;
37 virtual void SaveWindowPlacement( 37 virtual void SaveWindowPlacement(
38 const gfx::Rect& bounds, 38 const gfx::Rect& bounds,
39 ui::WindowShowState show_state) OVERRIDE; 39 ui::WindowShowState show_state) override;
40 virtual bool GetSavedWindowPlacement( 40 virtual bool GetSavedWindowPlacement(
41 const views::Widget* widget, 41 const views::Widget* widget,
42 gfx::Rect* bounds, 42 gfx::Rect* bounds,
43 ui::WindowShowState* show_state) const OVERRIDE; 43 ui::WindowShowState* show_state) const override;
44 virtual View* GetContentsView() OVERRIDE; 44 virtual View* GetContentsView() override;
45 virtual bool CanResize() const OVERRIDE; 45 virtual bool CanResize() const override;
46 virtual bool CanMaximize() const OVERRIDE; 46 virtual bool CanMaximize() const override;
47 virtual bool CanMinimize() const OVERRIDE; 47 virtual bool CanMinimize() const override;
48 48
49 const CreateParams params_; 49 const CreateParams params_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(ToplevelWindow); 51 DISALLOW_COPY_AND_ASSIGN(ToplevelWindow);
52 }; 52 };
53 53
54 } // namespace shell 54 } // namespace shell
55 } // namespace ash 55 } // namespace ash
56 56
57 #endif // ASH_SHELL_TOPLEVEL_WINDOW_H_ 57 #endif // ASH_SHELL_TOPLEVEL_WINDOW_H_
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/shell/widgets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698