Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/stacking_controller.cc

 // Copyright (c) 2012 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/wm/stacking_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 32 matching lines @@
 bool HasTransientParentWindow(const aura::Window* window) {
   return ::wm::GetTransientParent(window) &&
       ::wm::GetTransientParent(window)->type() !=
       ui::wm::WINDOW_TYPE_UNKNOWN;
 }
 
 AlwaysOnTopController* GetAlwaysOnTopController(aura::Window* root_window) {
   return GetRootWindowController(root_window)->always_on_top_controller();
 }
 
+aura::Window* GetContainerFromAlwaysOnTopController(aura::Window* root,
+                                                    aura::Window* window) {
+  return wm::WmWindowAura::GetAuraWindow(
+      GetAlwaysOnTopController(root)->GetContainer(
+          wm::WmWindowAura::Get(window)));
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
 }
 
 StackingController::~StackingController() {
 }
@@ skipping 14 matching lines @@
   }
 
   switch (window->type()) {
     case ui::wm::WINDOW_TYPE_NORMAL:
     case ui::wm::WINDOW_TYPE_POPUP:
       if (IsSystemModal(window))
         return GetSystemModalContainer(target_root, window);
       else if (HasTransientParentWindow(window))
         return RootWindowController::GetContainerForWindow(
             ::wm::GetTransientParent(window));
-      return GetAlwaysOnTopController(target_root)->GetContainer(window);
+      return GetContainerFromAlwaysOnTopController(target_root, window);
     case ui::wm::WINDOW_TYPE_CONTROL:
       return GetContainerById(target_root,
                               kShellWindowId_UnparentedControlContainer);
     case ui::wm::WINDOW_TYPE_PANEL:
       if (wm::GetWindowState(window)->panel_attached())
         return GetContainerById(target_root, kShellWindowId_PanelContainer);
       else
-        return GetAlwaysOnTopController(target_root)->GetContainer(window);
+        return GetContainerFromAlwaysOnTopController(target_root, window);
     case ui::wm::WINDOW_TYPE_MENU:
       return GetContainerById(target_root, kShellWindowId_MenuContainer);
     case ui::wm::WINDOW_TYPE_TOOLTIP:
       return GetContainerById(target_root,
                               kShellWindowId_DragImageAndTooltipContainer);
     default:
       NOTREACHED() << "Window " << window->id()
                    << " has unhandled type " << window->type();
       break;
   }
@@ skipping 27 matching lines @@
   if (window_container_id < kShellWindowId_LockScreenContainer) {
     container = GetContainerById(root, kShellWindowId_SystemModalContainer);
   } else {
     container = GetContainerById(root, kShellWindowId_LockSystemModalContainer);
   }
 
   return container;
 }
 
 }  // namespace ash