OLD | NEW |
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 virtual void EnterOverview() override; | 45 virtual void EnterOverview() override; |
46 // Exits overview and activates the previously active activity | 46 // Exits overview and activates the previously active activity |
47 virtual void ExitOverview() override; | 47 virtual void ExitOverview() override; |
48 virtual bool IsOverviewModeActive() override; | 48 virtual bool IsOverviewModeActive() override; |
49 | 49 |
50 private: | 50 private: |
51 friend class test::WindowManagerImplTestApi; | 51 friend class test::WindowManagerImplTestApi; |
52 friend class AthenaContainerLayoutManager; | 52 friend class AthenaContainerLayoutManager; |
53 | 53 |
54 enum Command { | 54 enum Command { |
| 55 CMD_EXIT_OVERVIEW, |
55 CMD_TOGGLE_OVERVIEW, | 56 CMD_TOGGLE_OVERVIEW, |
56 CMD_TOGGLE_SPLIT_VIEW, | 57 CMD_TOGGLE_SPLIT_VIEW, |
57 }; | 58 }; |
58 | 59 |
| 60 const AcceleratorData kEscAcceleratorData = {TRIGGER_ON_PRESS, |
| 61 ui::VKEY_ESCAPE, |
| 62 ui::EF_NONE, |
| 63 CMD_EXIT_OVERVIEW, |
| 64 AF_NONE}; |
| 65 |
59 // Exits overview mode without changing activation. The caller should | 66 // Exits overview mode without changing activation. The caller should |
60 // ensure that a window is active after exiting overview mode. | 67 // ensure that a window is active after exiting overview mode. |
61 void ExitOverviewNoActivate(); | 68 void ExitOverviewNoActivate(); |
62 | 69 |
63 void InstallAccelerators(); | 70 void InstallAccelerators(); |
64 | 71 |
65 // WindowManager: | 72 // WindowManager: |
66 virtual void AddObserver(WindowManagerObserver* observer) override; | 73 virtual void AddObserver(WindowManagerObserver* observer) override; |
67 virtual void RemoveObserver(WindowManagerObserver* observer) override; | 74 virtual void RemoveObserver(WindowManagerObserver* observer) override; |
68 virtual void ToggleSplitViewForTest() override; | 75 virtual void ToggleSplitViewForTest() override; |
(...skipping 28 matching lines...) Expand all Loading... |
97 scoped_ptr<TitleDragController> title_drag_controller_; | 104 scoped_ptr<TitleDragController> title_drag_controller_; |
98 scoped_ptr<wm::ShadowController> shadow_controller_; | 105 scoped_ptr<wm::ShadowController> shadow_controller_; |
99 ObserverList<WindowManagerObserver> observers_; | 106 ObserverList<WindowManagerObserver> observers_; |
100 | 107 |
101 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); | 108 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); |
102 }; | 109 }; |
103 | 110 |
104 } // namespace athena | 111 } // namespace athena |
105 | 112 |
106 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ | 113 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ |
OLD | NEW |