Shuffles and renames ash/common/wm classes

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/shell_window_ids.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/wm_globals.h"
-#include "ash/common/wm/wm_root_window_controller.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
-WmWindow* FindContainerRoot(WmGlobals* globals, const gfx::Rect& bounds) {
+WmWindow* FindContainerRoot(WmShell* shell, const gfx::Rect& bounds) {
   if (bounds == gfx::Rect())
-    return globals->GetRootWindowForNewWindows();
+    return shell->GetRootWindowForNewWindows();
   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());
 
   // If screen lock is not active and user session is active,
   // all modal windows are placed into the normal modal container.
   // In case of missing transient parent (it could happen for alerts from
   // background pages) assume that the window belongs to user session.
-  if (!window->GetGlobals()->IsUserSessionBlocked() ||
+  if (!window->GetShell()->IsUserSessionBlocked() ||
       !window->GetTransientParent()) {
     return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
   }
 
   // Otherwise those that originate from LockScreen container and above are
   // placed in the screen lock modal container.
   int window_container_id =
       window->GetTransientParent()->GetParent()->GetShellWindowId();
   if (window_container_id < kShellWindowId_LockScreenContainer)
     return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
@@ skipping 18 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->GetGlobals(), bounds);
+    target_root = FindContainerRoot(context->GetShell(), 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 13 matching lines @@
     default:
       NOTREACHED() << "Window " << window->GetShellWindowId()
                    << " has unhandled type " << window->GetType();
       break;
   }
   return nullptr;
 }
 
 }  // namespace wm
 }  // namespace ash