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

Side by Side Diff: ash/shell/window_type_launcher.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/widgets.cc ('k') | ash/shell/window_type_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 (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_WINDOW_TYPE_LAUNCHER_H_ 5 #ifndef ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
7 7
8 #include "ui/views/context_menu_controller.h" 8 #include "ui/views/context_menu_controller.h"
9 #include "ui/views/controls/button/button.h" 9 #include "ui/views/controls/button/button.h"
10 #include "ui/views/controls/menu/menu_delegate.h" 10 #include "ui/views/controls/menu/menu_delegate.h"
(...skipping 19 matching lines...) Expand all
30 30
31 private: 31 private:
32 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 32 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
33 33
34 enum MenuCommands { 34 enum MenuCommands {
35 COMMAND_NEW_WINDOW = 1, 35 COMMAND_NEW_WINDOW = 1,
36 COMMAND_TOGGLE_FULLSCREEN = 3, 36 COMMAND_TOGGLE_FULLSCREEN = 3,
37 }; 37 };
38 38
39 // Overridden from views::View: 39 // Overridden from views::View:
40 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 40 virtual void OnPaint(gfx::Canvas* canvas) override;
41 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 41 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
42 42
43 // Overridden from views::WidgetDelegate: 43 // Overridden from views::WidgetDelegate:
44 virtual views::View* GetContentsView() OVERRIDE; 44 virtual views::View* GetContentsView() override;
45 virtual bool CanResize() const OVERRIDE; 45 virtual bool CanResize() const override;
46 virtual base::string16 GetWindowTitle() const OVERRIDE; 46 virtual base::string16 GetWindowTitle() const override;
47 virtual bool CanMaximize() const OVERRIDE; 47 virtual bool CanMaximize() const override;
48 virtual bool CanMinimize() const OVERRIDE; 48 virtual bool CanMinimize() const override;
49 49
50 // Overridden from views::ButtonListener: 50 // Overridden from views::ButtonListener:
51 virtual void ButtonPressed(views::Button* sender, 51 virtual void ButtonPressed(views::Button* sender,
52 const ui::Event& event) OVERRIDE; 52 const ui::Event& event) override;
53 53
54 // Overridden from views::MenuDelegate: 54 // Overridden from views::MenuDelegate:
55 virtual void ExecuteCommand(int id, int event_flags) OVERRIDE; 55 virtual void ExecuteCommand(int id, int event_flags) override;
56 56
57 // Override from views::ContextMenuController: 57 // Override from views::ContextMenuController:
58 virtual void ShowContextMenuForView(views::View* source, 58 virtual void ShowContextMenuForView(views::View* source,
59 const gfx::Point& point, 59 const gfx::Point& point,
60 ui::MenuSourceType source_type) OVERRIDE; 60 ui::MenuSourceType source_type) override;
61 61
62 views::LabelButton* create_button_; 62 views::LabelButton* create_button_;
63 views::LabelButton* create_persistant_button_; 63 views::LabelButton* create_persistant_button_;
64 views::LabelButton* panel_button_; 64 views::LabelButton* panel_button_;
65 views::LabelButton* create_nonresizable_button_; 65 views::LabelButton* create_nonresizable_button_;
66 views::LabelButton* bubble_button_; 66 views::LabelButton* bubble_button_;
67 views::LabelButton* lock_button_; 67 views::LabelButton* lock_button_;
68 views::LabelButton* widgets_button_; 68 views::LabelButton* widgets_button_;
69 views::LabelButton* system_modal_button_; 69 views::LabelButton* system_modal_button_;
70 views::LabelButton* window_modal_button_; 70 views::LabelButton* window_modal_button_;
71 views::LabelButton* child_modal_button_; 71 views::LabelButton* child_modal_button_;
72 views::LabelButton* transient_button_; 72 views::LabelButton* transient_button_;
73 views::LabelButton* examples_button_; 73 views::LabelButton* examples_button_;
74 views::LabelButton* show_hide_window_button_; 74 views::LabelButton* show_hide_window_button_;
75 views::LabelButton* show_screensaver_; 75 views::LabelButton* show_screensaver_;
76 views::LabelButton* show_web_notification_; 76 views::LabelButton* show_web_notification_;
77 scoped_ptr<views::MenuRunner> menu_runner_; 77 scoped_ptr<views::MenuRunner> menu_runner_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); 79 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
80 }; 80 };
81 81
82 } // namespace shell 82 } // namespace shell
83 } // namespace ash 83 } // namespace ash
84 84
85 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 85 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
OLDNEW
« no previous file with comments | « ash/shell/widgets.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698