Moves maintaining root_window_for_new_windows_ to Shell

ash/common/wm/container_finder.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 "ash/common/wm/container_finder.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
-WmWindow* FindContainerRoot(WmShell* shell, const gfx::Rect& bounds) {
+WmWindow* FindContainerRoot(const gfx::Rect& bounds) {
   if (bounds == gfx::Rect())
-    return shell->GetRootWindowForNewWindows();
+    return Shell::GetWmRootWindowForNewWindows();
   return GetRootWindowMatching(bounds);
 }
 
 bool HasTransientParentWindow(const WmWindow* window) {
   return window->GetTransientParent() &&
          window->GetTransientParent()->GetType() != ui::wm::WINDOW_TYPE_UNKNOWN;
 }
 
 WmWindow* GetSystemModalContainer(WmWindow* root, WmWindow* window) {
   DCHECK(window->IsSystemModal());
@@ skipping 35 matching lines @@
 
 WmWindow* GetDefaultParent(WmWindow* context,
                            WmWindow* window,
                            const gfx::Rect& bounds) {
   WmWindow* target_root = nullptr;
   WmWindow* transient_parent = window->GetTransientParent();
   if (transient_parent) {
     // Transient window should use the same root as its transient parent.
     target_root = transient_parent->GetRootWindow();
   } else {
-    target_root = FindContainerRoot(context->GetShell(), bounds);
+    target_root = FindContainerRoot(bounds);
   }
 
   switch (window->GetType()) {
     case ui::wm::WINDOW_TYPE_NORMAL:
     case ui::wm::WINDOW_TYPE_POPUP:
       if (window->IsSystemModal())
         return GetSystemModalContainer(target_root, window);
       if (HasTransientParentWindow(window))
         return GetContainerForWindow(window->GetTransientParent());
       return GetContainerFromAlwaysOnTopController(target_root, window);
@@ skipping 30 matching lines @@
     if (priority_root && priority_root->Contains(container))
       containers.insert(containers.begin(), container);
     else
       containers.push_back(container);
   }
   return containers;
 }
 
 }  // namespace wm
 }  // namespace ash