mus: Forward user activity from window server to detector.

ash/mus/bridge/wm_shell_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
 #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"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
 
 namespace ash {
 namespace mus {
 
 namespace {
@@ skipping 58 matching lines @@
 
 }  // namespace
 
 WmShellMus::WmShellMus(
     std::unique_ptr<ShellDelegate> shell_delegate,
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router)
     : 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;
   const bool add_result =
       window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
   // WmShellMus is created early on, so that this should always succeed.
   DCHECK(add_result);
   accelerator_controller_delegate_.reset(
       new AcceleratorControllerDelegateMus(window_manager_));
   accelerator_controller_registrar_.reset(new AcceleratorControllerRegistrar(
@@ skipping 312 matching lines @@
   WmWindow* gained_active_wm = WmWindow::Get(gained_active);
   if (gained_active_wm)
     set_root_window_for_new_windows(gained_active_wm->GetRootWindow());
   WmWindow* lost_active_wm = WmWindow::Get(lost_active);
   for (auto& observer : activation_observers_)
     observer.OnWindowActivated(gained_active_wm, lost_active_wm);
 }
 
 }  // namespace mus
 }  // namespace ash