mus: Forward user activity from window server to detector.

ash/mus/bridge/wm_shell_mus.h

 // 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.
 
 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 class WindowTreeClient;
 }
 
+namespace ui {
+class UserActivityDetector;
+class UserActivityPowerManagerNotifier;
+}
+
 namespace views {
 class PointerWatcherEventRouter;
 }
 
 namespace ash {
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class RootWindowController;
+class UserActivityForwarder;
 class WindowManager;
 class WmShellMusTestApi;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell,
                    public aura::client::ActivationChangeObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
              WindowManager* window_manager,
              views::PointerWatcherEventRouter* pointer_watcher_event_router);
@@ skipping 86 matching lines @@
 
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
   std::unique_ptr<AcceleratorControllerRegistrar>
       accelerator_controller_registrar_;
   std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   base::ObserverList<WmActivationObserver> activation_observers_;
 
+  std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
+  std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;

[James Cook, 2017/01/18 17:01:38]

Is this the thing that actually sends the dbus signals? Does it register itself
as an observer on construction? Might be worth a comment somewhere.

[Daniel Erat, 2017/01/18 18:54:19]

done (added comments to ui/chromeos/user_activity_power_manager_notifier.h)

+  std::unique_ptr<UserActivityForwarder> user_activity_forwarder_;
+
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_