Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_manager_window_tree_factory_set.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 "components/mus/ws/window_manager_window_tree_factory_set.h"
 
 #include "components/mus/ws/user_id_tracker_observer.h"
 #include "components/mus/ws/window_manager_window_tree_factory.h"
 #include "components/mus/ws/window_manager_window_tree_factory_set_observer.h"
 #include "components/mus/ws/window_server.h"
@@ skipping 21 matching lines @@
     return nullptr;
   }
 
   std::unique_ptr<WindowManagerWindowTreeFactory> factory_ptr(
       new WindowManagerWindowTreeFactory(this, user_id, std::move(request)));
   WindowManagerWindowTreeFactory* factory = factory_ptr.get();
   factories_[user_id] = std::move(factory_ptr);
   return factory;
 }
 
-GlobalWindowManagerState*
-WindowManagerWindowTreeFactorySet::GetGlobalWindowManagerStateForUser(
+WindowManagerState*
+WindowManagerWindowTreeFactorySet::GetWindowManagerStateForUser(
     const UserId& user_id) {
   auto it = factories_.find(user_id);
-  return it == factories_.end()
-             ? nullptr
-             : it->second->window_tree()->global_window_manager_state();
+  if (it == factories_.end())
+    return nullptr;
+  return it->second->window_tree()
+             ? it->second->window_tree()->window_manager_state()
+             : nullptr;
 }
 
 void WindowManagerWindowTreeFactorySet::DeleteFactoryAssociatedWithTree(
     WindowTree* window_tree) {
   for (auto it = factories_.begin(); it != factories_.end(); ++it) {
     if (it->second->window_tree() == window_tree) {
       factories_.erase(it);
       return;
     }
   }
@@ skipping 23 matching lines @@
   got_valid_factory_ = true;
   FOR_EACH_OBSERVER(WindowManagerWindowTreeFactorySetObserver, observers_,
                     OnWindowManagerWindowTreeFactoryReady(factory));
 
   // Notify after other observers as WindowServer triggers other
   // observers being added, which will have already processed the add.
   if (is_first_valid_factory)
     window_server_->OnFirstWindowManagerWindowTreeFactoryReady();
 }
 
-void WindowManagerWindowTreeFactorySet::OnActiveUserIdChanged(
-    const UserId& previously_active_id,
-    const UserId& active_id) {}
-
-void WindowManagerWindowTreeFactorySet::OnUserIdAdded(const UserId& id) {}
-
 void WindowManagerWindowTreeFactorySet::OnUserIdRemoved(const UserId& id) {
   factories_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace mus