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

Side by Side Diff: athena/wm/window_manager_impl.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/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.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_WM_WINDOW_MANAGER_IMPL_H_ 5 #ifndef ATHENA_WM_WINDOW_MANAGER_IMPL_H_
6 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 6 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "athena/input/public/accelerator_manager.h" 9 #include "athena/input/public/accelerator_manager.h"
10 #include "athena/wm/public/window_manager.h" 10 #include "athena/wm/public/window_manager.h"
(...skipping 24 matching lines...) Expand all
35 public aura::WindowObserver, 35 public aura::WindowObserver,
36 public AcceleratorHandler, 36 public AcceleratorHandler,
37 public TitleDragControllerDelegate { 37 public TitleDragControllerDelegate {
38 public: 38 public:
39 WindowManagerImpl(); 39 WindowManagerImpl();
40 virtual ~WindowManagerImpl(); 40 virtual ~WindowManagerImpl();
41 41
42 void ToggleSplitView(); 42 void ToggleSplitView();
43 43
44 // WindowManager: 44 // WindowManager:
45 virtual void ToggleOverview() OVERRIDE; 45 virtual void ToggleOverview() override;
46 virtual bool IsOverviewModeActive() OVERRIDE; 46 virtual bool IsOverviewModeActive() override;
47 47
48 private: 48 private:
49 friend class test::WindowManagerImplTestApi; 49 friend class test::WindowManagerImplTestApi;
50 friend class AthenaContainerLayoutManager; 50 friend class AthenaContainerLayoutManager;
51 51
52 enum Command { 52 enum Command {
53 CMD_TOGGLE_OVERVIEW, 53 CMD_TOGGLE_OVERVIEW,
54 CMD_TOGGLE_SPLIT_VIEW, 54 CMD_TOGGLE_SPLIT_VIEW,
55 }; 55 };
56 56
57 // Sets whether overview mode is active. 57 // Sets whether overview mode is active.
58 void SetInOverview(bool active); 58 void SetInOverview(bool active);
59 59
60 void InstallAccelerators(); 60 void InstallAccelerators();
61 61
62 // WindowManager: 62 // WindowManager:
63 virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE; 63 virtual void AddObserver(WindowManagerObserver* observer) override;
64 virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE; 64 virtual void RemoveObserver(WindowManagerObserver* observer) override;
65 virtual void ToggleSplitViewForTest() OVERRIDE; 65 virtual void ToggleSplitViewForTest() override;
66 virtual WindowListProvider* GetWindowListProvider() OVERRIDE; 66 virtual WindowListProvider* GetWindowListProvider() override;
67 67
68 // WindowOverviewModeDelegate: 68 // WindowOverviewModeDelegate:
69 virtual void OnSelectWindow(aura::Window* window) OVERRIDE; 69 virtual void OnSelectWindow(aura::Window* window) override;
70 virtual void OnSelectSplitViewWindow(aura::Window* left, 70 virtual void OnSelectSplitViewWindow(aura::Window* left,
71 aura::Window* right, 71 aura::Window* right,
72 aura::Window* to_activate) OVERRIDE; 72 aura::Window* to_activate) override;
73 73
74 // aura::WindowObserver: 74 // aura::WindowObserver:
75 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 75 virtual void OnWindowDestroying(aura::Window* window) override;
76 76
77 // AcceleratorHandler: 77 // AcceleratorHandler:
78 virtual bool IsCommandEnabled(int command_id) const OVERRIDE; 78 virtual bool IsCommandEnabled(int command_id) const override;
79 virtual bool OnAcceleratorFired(int command_id, 79 virtual bool OnAcceleratorFired(int command_id,
80 const ui::Accelerator& accelerator) OVERRIDE; 80 const ui::Accelerator& accelerator) override;
81 81
82 // TitleDragControllerDelegate: 82 // TitleDragControllerDelegate:
83 virtual aura::Window* GetWindowBehind(aura::Window* window) OVERRIDE; 83 virtual aura::Window* GetWindowBehind(aura::Window* window) override;
84 virtual void OnTitleDragStarted(aura::Window* window) OVERRIDE; 84 virtual void OnTitleDragStarted(aura::Window* window) override;
85 virtual void OnTitleDragCompleted(aura::Window* window) OVERRIDE; 85 virtual void OnTitleDragCompleted(aura::Window* window) override;
86 virtual void OnTitleDragCanceled(aura::Window* window) OVERRIDE; 86 virtual void OnTitleDragCanceled(aura::Window* window) override;
87 87
88 scoped_ptr<aura::Window> container_; 88 scoped_ptr<aura::Window> container_;
89 scoped_ptr<WindowListProvider> window_list_provider_; 89 scoped_ptr<WindowListProvider> window_list_provider_;
90 scoped_ptr<WindowOverviewMode> overview_; 90 scoped_ptr<WindowOverviewMode> overview_;
91 scoped_ptr<BezelController> bezel_controller_; 91 scoped_ptr<BezelController> bezel_controller_;
92 scoped_ptr<SplitViewController> split_view_controller_; 92 scoped_ptr<SplitViewController> split_view_controller_;
93 scoped_ptr<wm::WMState> wm_state_; 93 scoped_ptr<wm::WMState> wm_state_;
94 scoped_ptr<TitleDragController> title_drag_controller_; 94 scoped_ptr<TitleDragController> title_drag_controller_;
95 scoped_ptr<wm::ShadowController> shadow_controller_; 95 scoped_ptr<wm::ShadowController> shadow_controller_;
96 ObserverList<WindowManagerObserver> observers_; 96 ObserverList<WindowManagerObserver> observers_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 98 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
99 }; 99 };
100 100
101 } // namespace athena 101 } // namespace athena
102 102
103 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 103 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698