mus: Add UserActivityMonitor.

components/mus/ws/window_server.cc

 // Copyright 2014 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 "components/mus/ws/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "components/mus/public/cpp/surfaces/surfaces_type_converters.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/server_window.h"
+#include "components/mus/ws/user_activity_monitor.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "components/mus/ws/window_manager_access_policy.h"
 #include "components/mus/ws/window_manager_display_root.h"
 #include "components/mus/ws/window_manager_state.h"
 #include "components/mus/ws/window_manager_window_tree_factory.h"
 #include "components/mus/ws/window_server_delegate.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "services/shell/public/cpp/connection.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace mus {
 namespace ws {
 
 WindowServer::WindowServer(
     WindowServerDelegate* delegate,
     const scoped_refptr<mus::SurfacesState>& surfaces_state)
     : delegate_(delegate),
       surfaces_state_(surfaces_state),
       next_client_id_(1),
       display_manager_(new DisplayManager(this, &user_id_tracker_)),
       current_operation_(nullptr),
       in_destructor_(false),
       next_wm_change_id_(0),
-      window_manager_window_tree_factory_set_(this, &user_id_tracker_) {}
+      window_manager_window_tree_factory_set_(this, &user_id_tracker_) {
+  user_id_tracker_.AddObserver(this);
+  OnUserIdAdded(user_id_tracker_.active_id());

[sadrul, 2016/06/27 20:46:13]

This is necessary since the 'root user id' is added upon construction of
UserIdTracker, and the observers are not notified of it.

I didn't RemoveObserver() from user_id_tracker_ from the dtor since at that
point, UserIdTracker is also being destroyed.

+}
 
 WindowServer::~WindowServer() {
   in_destructor_ = true;
 
   // Destroys the window trees results in querying for the display. Tear down
   // the displays first so that the trees are notified of the display going
   // away while the display is still valid.
   display_manager_->DestroyAllDisplays();
 
   while (!tree_map_.empty())
@@ skipping 171 matching lines @@
 void WindowServer::OnFirstWindowManagerWindowTreeFactoryReady() {
   if (display_manager_->has_active_or_pending_displays())
     return;
 
   // We've been supplied a WindowManagerFactory and no displays have been
   // created yet. Treat this as a signal to create a Display.
   // TODO(sky): we need a better way to determine this, most likely a switch.
   delegate_->CreateDefaultDisplays();
 }
 
+UserActivityMonitor* WindowServer::GetUserActivityMonitorForUser(
+    const UserId& user_id) {
+  DCHECK_GT(activity_monitor_map_.count(user_id), 0u);
+  return activity_monitor_map_[user_id].get();
+}
+
 bool WindowServer::SetFocusedWindow(ServerWindow* window) {
   // TODO(sky): this should fail if there is modal dialog active and |window|
   // is outside that.
   ServerWindow* currently_focused = GetFocusedWindow();
   Display* focused_display =
       currently_focused
           ? display_manager_->GetDisplayContaining(currently_focused)
           : nullptr;
   if (!window)
     return focused_display ? focused_display->SetFocusedWindow(nullptr) : true;
@@ skipping 431 matching lines @@
     *values = window_manager_state->frame_decoration_values().Clone();
   return window_manager_state->got_frame_decoration_values();
 }
 
 WindowManagerState* WindowServer::GetWindowManagerStateForUser(
     const UserId& user_id) {
   return window_manager_window_tree_factory_set_.GetWindowManagerStateForUser(
       user_id);
 }
 
+void WindowServer::OnActiveUserIdChanged(const UserId& previously_active_id,
+                                         const UserId& active_id) {}
+
+void WindowServer::OnUserIdAdded(const UserId& id) {
+  activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
+}
+
+void WindowServer::OnUserIdRemoved(const UserId& id) {
+  activity_monitor_map_.erase(id);
+}
+
 }  // namespace ws
 }  // namespace mus