Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_manager_window_tree_factory_set.cc

Index: components/mus/ws/window_manager_window_tree_factory_set.cc
diff --git a/components/mus/ws/window_manager_window_tree_factory_set.cc b/components/mus/ws/window_manager_window_tree_factory_set.cc
index d1d8fbc54e876cb7c59a022d64967d9bc5ba836e..91d01a8ab47f27517ace89ceeb4057559be4d25f 100644
--- a/components/mus/ws/window_manager_window_tree_factory_set.cc
+++ b/components/mus/ws/window_manager_window_tree_factory_set.cc
@@ -39,13 +39,15 @@ WindowManagerWindowTreeFactory* WindowManagerWindowTreeFactorySet::Add(
   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(
@@ -89,12 +91,6 @@ void WindowManagerWindowTreeFactorySet::OnWindowManagerWindowTreeFactoryReady(
     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);
 }