| 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_MUS_BRIDGE_WM_SHELL_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 16 #include "ui/wm/public/activation_change_observer.h" | 16 #include "ui/wm/public/activation_change_observer.h" |
| 17 | 17 |
| 18 namespace aura { | 18 namespace aura { |
| 19 class WindowTreeClient; | 19 class WindowTreeClient; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace ui { |
| 23 class UserActivityDetector; |
| 24 class UserActivityPowerManagerNotifier; |
| 25 } |
| 26 |
| 22 namespace views { | 27 namespace views { |
| 23 class PointerWatcherEventRouter; | 28 class PointerWatcherEventRouter; |
| 24 } | 29 } |
| 25 | 30 |
| 26 namespace ash { | 31 namespace ash { |
| 27 namespace mus { | 32 namespace mus { |
| 28 | 33 |
| 29 class AcceleratorControllerDelegateMus; | 34 class AcceleratorControllerDelegateMus; |
| 30 class AcceleratorControllerRegistrar; | 35 class AcceleratorControllerRegistrar; |
| 31 class ImmersiveHandlerFactoryMus; | 36 class ImmersiveHandlerFactoryMus; |
| 32 class RootWindowController; | 37 class RootWindowController; |
| 38 class UserActivityForwarder; |
| 33 class WindowManager; | 39 class WindowManager; |
| 34 class WmShellMusTestApi; | 40 class WmShellMusTestApi; |
| 35 | 41 |
| 36 // WmShell implementation for mus. | 42 // WmShell implementation for mus. |
| 37 class WmShellMus : public WmShell, | 43 class WmShellMus : public WmShell, |
| 38 public aura::client::ActivationChangeObserver { | 44 public aura::client::ActivationChangeObserver { |
| 39 public: | 45 public: |
| 40 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate, | 46 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate, |
| 41 WindowManager* window_manager, | 47 WindowManager* window_manager, |
| 42 views::PointerWatcherEventRouter* pointer_watcher_event_router); | 48 views::PointerWatcherEventRouter* pointer_watcher_event_router); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 135 |
| 130 std::unique_ptr<AcceleratorControllerDelegateMus> | 136 std::unique_ptr<AcceleratorControllerDelegateMus> |
| 131 accelerator_controller_delegate_; | 137 accelerator_controller_delegate_; |
| 132 std::unique_ptr<AcceleratorControllerRegistrar> | 138 std::unique_ptr<AcceleratorControllerRegistrar> |
| 133 accelerator_controller_registrar_; | 139 accelerator_controller_registrar_; |
| 134 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 140 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
| 135 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 141 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 136 | 142 |
| 137 base::ObserverList<WmActivationObserver> activation_observers_; | 143 base::ObserverList<WmActivationObserver> activation_observers_; |
| 138 | 144 |
| 145 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
| 146 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 147 std::unique_ptr<UserActivityForwarder> user_activity_forwarder_; |
| 148 |
| 139 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 149 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 140 }; | 150 }; |
| 141 | 151 |
| 142 } // namespace mus | 152 } // namespace mus |
| 143 } // namespace ash | 153 } // namespace ash |
| 144 | 154 |
| 145 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 155 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |