More user id tracking for mus:

components/mus/ws/connection_manager.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/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager_delegate.h"
@@ skipping 17 matching lines @@
     ConnectionManagerDelegate* delegate,
     const scoped_refptr<mus::SurfacesState>& surfaces_state)
     : delegate_(delegate),
       surfaces_state_(surfaces_state),
       next_connection_id_(1),
       next_host_id_(0),
       current_operation_(nullptr),
       in_destructor_(false),
       next_wm_change_id_(0),
       got_valid_frame_decorations_(false),
-      window_manager_factory_registry_(this) {}
+      window_manager_factory_registry_(this, &user_id_tracker_) {}
 
 ConnectionManager::~ConnectionManager() {
   in_destructor_ = true;
 
   while (!pending_hosts_.empty())
     DestroyHost(*pending_hosts_.begin());
   DCHECK(pending_hosts_.empty());
 
   // DestroyHost() removes from |hosts_| and deletes the WindowTreeHostImpl.
   while (!hosts_.empty())
@@ skipping 256 matching lines @@
 WindowTreeHostImpl* ConnectionManager::GetActiveWindowTreeHost() {
   // TODO(sky): this isn't active, but first. Make it active.
   return hosts_.size() ? *hosts_.begin() : nullptr;
 }
 
 void ConnectionManager::AddDisplayManagerBinding(
     mojo::InterfaceRequest<mojom::DisplayManager> request) {
   display_manager_bindings_.AddBinding(this, std::move(request));
 }
 
-void ConnectionManager::CreateWindowManagerFactoryService(
-    uint32_t user_id,
-    mojo::InterfaceRequest<mojom::WindowManagerFactoryService> request) {
-  window_manager_factory_registry_.Register(user_id, std::move(request));
-}
-
-void ConnectionManager::OnWindowManagerFactorySet() {
+void ConnectionManager::OnFirstWindowManagerFactorySet() {
   if (!hosts_.empty() || !pending_hosts_.empty())
     return;
 
   // We've been supplied a WindowManagerFactory and no windowtreehosts have been
   // created yet. Treat this as a signal to create a WindowTreeHost.
   // TODO(sky): we need a better way to determine this, most likely a switch.
   delegate_->CreateDefaultWindowTreeHosts();
 }
 
 uint32_t ConnectionManager::GenerateWindowManagerChangeId(
@@ skipping 437 matching lines @@
   if (!got_valid_frame_decorations_) {
     display_manager_observers_.AddInterfacePtr(std::move(observer));
     return;
   }
   CallOnDisplays(observer.get());
   display_manager_observers_.AddInterfacePtr(std::move(observer));
 }
 
 }  // namespace ws
 }  // namespace mus