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_COMMON_WM_SHELL_H_ | 5 #ifndef ASH_COMMON_WM_SHELL_H_ |
6 #define ASH_COMMON_WM_SHELL_H_ | 6 #define ASH_COMMON_WM_SHELL_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 | 295 |
296 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; | 296 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; |
297 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; | 297 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; |
298 | 298 |
299 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; | 299 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; |
300 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; | 300 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; |
301 | 301 |
302 void AddShellObserver(ShellObserver* observer); | 302 void AddShellObserver(ShellObserver* observer); |
303 void RemoveShellObserver(ShellObserver* observer); | 303 void RemoveShellObserver(ShellObserver* observer); |
304 | 304 |
305 virtual void AddPointerWatcher(views::PointerWatcher* watcher) = 0; | 305 virtual void AddPointerWatcher(views::PointerWatcher* watcher, |
| 306 bool wants_moves = false) = 0; |
306 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; | 307 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; |
307 | 308 |
308 // TODO: Move these back to LockStateController when that has been moved. | 309 // TODO: Move these back to LockStateController when that has been moved. |
309 void OnLockStateEvent(LockStateObserver::EventType event); | 310 void OnLockStateEvent(LockStateObserver::EventType event); |
310 void AddLockStateObserver(LockStateObserver* observer); | 311 void AddLockStateObserver(LockStateObserver* observer); |
311 void RemoveLockStateObserver(LockStateObserver* observer); | 312 void RemoveLockStateObserver(LockStateObserver* observer); |
312 | 313 |
313 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate); | 314 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate); |
314 | 315 |
315 // True if any touch points are down. | 316 // True if any touch points are down. |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 bool simulate_modal_window_open_for_testing_ = false; | 397 bool simulate_modal_window_open_for_testing_ = false; |
397 | 398 |
398 #if defined(OS_CHROMEOS) | 399 #if defined(OS_CHROMEOS) |
399 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 400 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
400 #endif | 401 #endif |
401 }; | 402 }; |
402 | 403 |
403 } // namespace ash | 404 } // namespace ash |
404 | 405 |
405 #endif // ASH_COMMON_WM_SHELL_H_ | 406 #endif // ASH_COMMON_WM_SHELL_H_ |
OLD | NEW |