Index: ash/mus/bridge/wm_shell_mus.cc |
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc |
index d7c5b61eb781f2dc36ecf8150dab16786fd44f63..6eb353daecd26ca0cede126dff603ed6a3aa6a8b 100644 |
--- a/ash/mus/bridge/wm_shell_mus.cc |
+++ b/ash/mus/bridge/wm_shell_mus.cc |
@@ -27,12 +27,15 @@ |
#include "ash/mus/drag_window_resizer.h" |
#include "ash/mus/keyboard_ui_mus.h" |
#include "ash/mus/root_window_controller.h" |
+#include "ash/mus/user_activity_forwarder.h" |
#include "ash/mus/window_manager.h" |
#include "ash/shared/immersive_fullscreen_controller.h" |
#include "base/memory/ptr_util.h" |
#include "components/user_manager/user_info_impl.h" |
#include "ui/aura/mus/window_tree_client.h" |
#include "ui/aura/window.h" |
+#include "ui/base/user_activity/user_activity_detector.h" |
+#include "ui/chromeos/user_activity_power_manager_notifier.h" |
#include "ui/display/manager/managed_display_info.h" |
#include "ui/display/screen.h" |
#include "ui/views/mus/pointer_watcher_event_router.h" |
@@ -111,7 +114,14 @@ WmShellMus::WmShellMus( |
: WmShell(std::move(shell_delegate)), |
window_manager_(window_manager), |
pointer_watcher_event_router_(pointer_watcher_event_router), |
- session_state_delegate_(new SessionStateDelegateStub) { |
+ session_state_delegate_(new SessionStateDelegateStub), |
+ user_activity_detector_(base::MakeUnique<ui::UserActivityDetector>()), |
+ user_activity_notifier_( |
+ base::MakeUnique<ui::UserActivityPowerManagerNotifier>( |
+ user_activity_detector_.get())), |
+ user_activity_forwarder_(base::MakeUnique<UserActivityForwarder>( |
+ delegate()->GetShellConnector(), |
+ user_activity_detector_.get())) { |
WmShell::Set(this); |
uint16_t accelerator_namespace_id = 0u; |