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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 void SetLaserPointerEnabled(bool enabled) override; | 88 void SetLaserPointerEnabled(bool enabled) override; |
89 | 89 |
90 private: | 90 private: |
91 // aura::client::ActivationChangeObserver: | 91 // aura::client::ActivationChangeObserver: |
92 void OnWindowActivated(ActivationReason reason, | 92 void OnWindowActivated(ActivationReason reason, |
93 aura::Window* gained_active, | 93 aura::Window* gained_active, |
94 aura::Window* lost_active) override; | 94 aura::Window* lost_active) override; |
95 void OnAttemptToReactivateWindow(aura::Window* request_active, | 95 void OnAttemptToReactivateWindow(aura::Window* request_active, |
96 aura::Window* actual_active) override; | 96 aura::Window* actual_active) override; |
97 | 97 |
| 98 // SessionStateObserver: |
| 99 void SessionStateChanged(session_manager::SessionState state) override; |
| 100 |
98 // WindowTreeHostManager::Observer: | 101 // WindowTreeHostManager::Observer: |
99 void OnDisplayConfigurationChanging() override; | 102 void OnDisplayConfigurationChanging() override; |
100 void OnDisplayConfigurationChanged() override; | 103 void OnDisplayConfigurationChanged() override; |
101 | 104 |
102 WmLookupAura wm_lookup_; | 105 WmLookupAura wm_lookup_; |
103 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; | 106 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; |
104 | 107 |
105 bool added_activation_observer_ = false; | 108 bool added_activation_observer_ = false; |
106 base::ObserverList<WmActivationObserver> activation_observers_; | 109 base::ObserverList<WmActivationObserver> activation_observers_; |
107 | 110 |
108 bool added_display_observer_ = false; | 111 bool added_display_observer_ = false; |
109 base::ObserverList<WmDisplayObserver> display_observers_; | 112 base::ObserverList<WmDisplayObserver> display_observers_; |
110 | 113 |
111 DISALLOW_COPY_AND_ASSIGN(WmShellAura); | 114 DISALLOW_COPY_AND_ASSIGN(WmShellAura); |
112 }; | 115 }; |
113 | 116 |
114 } // namespace ash | 117 } // namespace ash |
115 | 118 |
116 #endif // ASH_AURA_WM_SHELL_AURA_H_ | 119 #endif // ASH_AURA_WM_SHELL_AURA_H_ |
OLD | NEW |