Makes ash/mus use RootWindowControllerCommon

ash/mus/user_window_controller_impl.cc

 // Copyright 2015 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 "ash/mus/user_window_controller_impl.h"
 
+#include "ash/common/shell_window_ids.h"
+#include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/resources/grit/ui_resources.h"
 
@@ skipping 112 matching lines @@
 
 ::mus::Window* UserWindowControllerImpl::GetUserWindowById(uint32_t id) {
   for (::mus::Window* window : GetUserWindowContainer()->children()) {
     if (window->GetLocalProperty(kUserWindowIdKey) == id)
       return window;
   }
   return nullptr;
 }
 
 ::mus::Window* UserWindowControllerImpl::GetUserWindowContainer() const {
-  return root_controller_->GetWindowForContainer(
-      mojom::Container::USER_PRIVATE_WINDOWS);
+  WmWindowMus* window = root_controller_->GetWindowByShellWindowId(
+      kShellWindowId_DefaultContainer);
+  return window ? window->mus_window() : nullptr;
 }
 
 void UserWindowControllerImpl::OnTreeChanging(const TreeChangeParams& params) {
   DCHECK(root_controller_);
   if (params.new_parent == GetUserWindowContainer()) {
     params.target->AddObserver(window_property_observer_.get());
     AssignIdIfNecessary(params.target);
     if (user_window_observer_)
       user_window_observer_->OnUserWindowAdded(GetUserWindow(params.target));
   } else if (params.old_parent == GetUserWindowContainer()) {
@@ skipping 45 matching lines @@
 }
 
 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
   ::mus::Window* window = GetUserWindowById(window_id);
   if (window)
     window->SetFocus();
 }
 
 }  // namespace mus
 }  // namespace ash