| 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 11 matching lines...) Expand all Loading... |
| 22 class Display; | 22 class Display; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace gfx { | 25 namespace gfx { |
| 26 class Insets; | 26 class Insets; |
| 27 class Point; | 27 class Point; |
| 28 } | 28 } |
| 29 | 29 |
| 30 namespace views { | 30 namespace views { |
| 31 class PointerWatcher; | 31 class PointerWatcher; |
| 32 enum class RequestedEvents; |
| 32 } | 33 } |
| 33 | 34 |
| 34 namespace ash { | 35 namespace ash { |
| 35 | 36 |
| 36 class AcceleratorController; | 37 class AcceleratorController; |
| 37 class AccessibilityDelegate; | 38 class AccessibilityDelegate; |
| 38 class BrightnessControlDelegate; | 39 class BrightnessControlDelegate; |
| 39 class DisplayInfo; | 40 class DisplayInfo; |
| 40 class FocusCycler; | 41 class FocusCycler; |
| 41 class ImmersiveContextAsh; | 42 class ImmersiveContextAsh; |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; | 316 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; |
| 316 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; | 317 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; |
| 317 | 318 |
| 318 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; | 319 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; |
| 319 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; | 320 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; |
| 320 | 321 |
| 321 void AddShellObserver(ShellObserver* observer); | 322 void AddShellObserver(ShellObserver* observer); |
| 322 void RemoveShellObserver(ShellObserver* observer); | 323 void RemoveShellObserver(ShellObserver* observer); |
| 323 | 324 |
| 324 // If |wants_moves| is true PointerWatcher::OnPointerEventObserved() is | 325 // If |wants_moves| is true PointerWatcher::OnPointerEventObserved() is |
| 325 // called for pointer move events. Enabling pointer moves may incur a | 326 // called for pointer move events. If |wants_drags| is true |
| 326 // performance hit and should be avoided if possible. | 327 // PointerWatcher::OnPointerEventObserved() is called for pointer drag events. |
| 328 // Enabling pointer moves or drags may incur a performance hit and should be |
| 329 // avoided if possible. |
| 327 virtual void AddPointerWatcher(views::PointerWatcher* watcher, | 330 virtual void AddPointerWatcher(views::PointerWatcher* watcher, |
| 328 bool wants_moves) = 0; | 331 views::RequestedEvents events) = 0; |
| 329 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; | 332 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; |
| 330 | 333 |
| 331 // TODO: Move these back to LockStateController when that has been moved. | 334 // TODO: Move these back to LockStateController when that has been moved. |
| 332 void OnLockStateEvent(LockStateObserver::EventType event); | 335 void OnLockStateEvent(LockStateObserver::EventType event); |
| 333 void AddLockStateObserver(LockStateObserver* observer); | 336 void AddLockStateObserver(LockStateObserver* observer); |
| 334 void RemoveLockStateObserver(LockStateObserver* observer); | 337 void RemoveLockStateObserver(LockStateObserver* observer); |
| 335 | 338 |
| 336 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate); | 339 void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate); |
| 337 void SetPaletteDelegateForTesting( | 340 void SetPaletteDelegateForTesting( |
| 338 std::unique_ptr<PaletteDelegate> palette_delegate); | 341 std::unique_ptr<PaletteDelegate> palette_delegate); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 bool simulate_modal_window_open_for_testing_ = false; | 423 bool simulate_modal_window_open_for_testing_ = false; |
| 421 | 424 |
| 422 #if defined(OS_CHROMEOS) | 425 #if defined(OS_CHROMEOS) |
| 423 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 426 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 424 #endif | 427 #endif |
| 425 }; | 428 }; |
| 426 | 429 |
| 427 } // namespace ash | 430 } // namespace ash |
| 428 | 431 |
| 429 #endif // ASH_COMMON_WM_SHELL_H_ | 432 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |