OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_AURA_WM_SHELL_AURA_H_ | 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_ |
6 #define ASH_AURA_WM_SHELL_AURA_H_ | 6 #define ASH_AURA_WM_SHELL_AURA_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 override; | 67 override; |
68 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( | 68 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( |
69 WmWindow* workspace_window) override; | 69 WmWindow* workspace_window) override; |
70 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> | 70 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> |
71 CreateScopedDisableInternalMouseAndKeyboard() override; | 71 CreateScopedDisableInternalMouseAndKeyboard() override; |
72 std::unique_ptr<ImmersiveFullscreenController> | 72 std::unique_ptr<ImmersiveFullscreenController> |
73 CreateImmersiveFullscreenController() override; | 73 CreateImmersiveFullscreenController() override; |
74 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; | 74 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; |
75 void OnOverviewModeStarting() override; | 75 void OnOverviewModeStarting() override; |
76 void OnOverviewModeEnded() override; | 76 void OnOverviewModeEnded() override; |
| 77 void OnUserSessionStateActive() override; |
77 SessionStateDelegate* GetSessionStateDelegate() override; | 78 SessionStateDelegate* GetSessionStateDelegate() override; |
78 void AddActivationObserver(WmActivationObserver* observer) override; | 79 void AddActivationObserver(WmActivationObserver* observer) override; |
79 void RemoveActivationObserver(WmActivationObserver* observer) override; | 80 void RemoveActivationObserver(WmActivationObserver* observer) override; |
80 void AddDisplayObserver(WmDisplayObserver* observer) override; | 81 void AddDisplayObserver(WmDisplayObserver* observer) override; |
81 void RemoveDisplayObserver(WmDisplayObserver* observer) override; | 82 void RemoveDisplayObserver(WmDisplayObserver* observer) override; |
82 void AddPointerWatcher(views::PointerWatcher* watcher, | 83 void AddPointerWatcher(views::PointerWatcher* watcher, |
83 views::PointerWatcherEventTypes events) override; | 84 views::PointerWatcherEventTypes events) override; |
84 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 85 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
85 void RequestShutdown() override; | 86 void RequestShutdown() override; |
86 bool IsTouchDown() override; | 87 bool IsTouchDown() override; |
(...skipping 22 matching lines...) Expand all Loading... |
109 | 110 |
110 bool added_display_observer_ = false; | 111 bool added_display_observer_ = false; |
111 base::ObserverList<WmDisplayObserver> display_observers_; | 112 base::ObserverList<WmDisplayObserver> display_observers_; |
112 | 113 |
113 DISALLOW_COPY_AND_ASSIGN(WmShellAura); | 114 DISALLOW_COPY_AND_ASSIGN(WmShellAura); |
114 }; | 115 }; |
115 | 116 |
116 } // namespace ash | 117 } // namespace ash |
117 | 118 |
118 #endif // ASH_AURA_WM_SHELL_AURA_H_ | 119 #endif // ASH_AURA_WM_SHELL_AURA_H_ |
OLD | NEW |