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

Side by Side Diff: ash/shell/panel_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/lock_view.cc ('k') | ash/shell/shelf_delegate_impl.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_SHELL_PANEL_WINDOW_H_ 5 #ifndef ASH_SHELL_PANEL_WINDOW_H_
6 #define ASH_SHELL_PANEL_WINDOW_H_ 6 #define ASH_SHELL_PANEL_WINDOW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/aura/aura_export.h" 9 #include "ui/aura/aura_export.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 15 matching lines...) Expand all
26 views::Widget* CreateWidget(); 26 views::Widget* CreateWidget();
27 27
28 const std::string& name() { return name_; } 28 const std::string& name() { return name_; }
29 views::Widget::InitParams& params() { return params_; } 29 views::Widget::InitParams& params() { return params_; }
30 30
31 // Creates a panel window and returns the associated widget. 31 // Creates a panel window and returns the associated widget.
32 static views::Widget* CreatePanelWindow(const gfx::Rect& rect); 32 static views::Widget* CreatePanelWindow(const gfx::Rect& rect);
33 33
34 private: 34 private:
35 // Overridden from views::View: 35 // Overridden from views::View:
36 virtual gfx::Size GetPreferredSize() const OVERRIDE; 36 virtual gfx::Size GetPreferredSize() const override;
37 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 37 virtual void OnPaint(gfx::Canvas* canvas) override;
38 38
39 // Overridden from views::WidgetDelegate: 39 // Overridden from views::WidgetDelegate:
40 virtual base::string16 GetWindowTitle() const OVERRIDE; 40 virtual base::string16 GetWindowTitle() const override;
41 virtual View* GetContentsView() OVERRIDE; 41 virtual View* GetContentsView() override;
42 virtual bool CanResize() const OVERRIDE; 42 virtual bool CanResize() const override;
43 virtual bool CanMaximize() const OVERRIDE; 43 virtual bool CanMaximize() const override;
44 virtual bool CanMinimize() const OVERRIDE; 44 virtual bool CanMinimize() const override;
45 virtual views::NonClientFrameView* CreateNonClientFrameView( 45 virtual views::NonClientFrameView* CreateNonClientFrameView(
46 views::Widget* widget) OVERRIDE; 46 views::Widget* widget) override;
47 47
48 std::string name_; 48 std::string name_;
49 views::Widget::InitParams params_; 49 views::Widget::InitParams params_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(PanelWindow); 51 DISALLOW_COPY_AND_ASSIGN(PanelWindow);
52 }; 52 };
53 53
54 } // namespace ash 54 } // namespace ash
55 55
56 #endif // ASH_SHELL_PANEL_WINDOW_H_ 56 #endif // ASH_SHELL_PANEL_WINDOW_H_
OLDNEW
« no previous file with comments | « ash/shell/lock_view.cc ('k') | ash/shell/shelf_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698