chromeos: converts PanelLayoutManager to aura::Window

ash/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/wm/container_finder.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
@@ skipping 42 matching lines @@
   // Otherwise those that originate from LockScreen container and above are
   // placed in the screen lock modal container.
   int window_container_id = transient_parent->parent()->id();
   if (window_container_id < kShellWindowId_LockScreenContainer)
     return root->GetChildById(kShellWindowId_SystemModalContainer);
   return root->GetChildById(kShellWindowId_LockSystemModalContainer);
 }
 
 aura::Window* GetContainerFromAlwaysOnTopController(aura::Window* root,
                                                     aura::Window* window) {
-  WmWindow* result = RootWindowController::ForWindow(root)
-                         ->always_on_top_controller()
-                         ->GetContainer(WmWindow::Get(window));
-  return result ? result->aura_window() : nullptr;
+  return RootWindowController::ForWindow(root)
+      ->always_on_top_controller()
+      ->GetContainer(window);
 }
 
 }  // namespace
 
 aura::Window* GetContainerForWindow(aura::Window* window) {
   aura::Window* parent = window->parent();
   // The first parent with an explicit shell window ID is the container.
   while (parent && parent->id() == kShellWindowId_Invalid)
     parent = parent->parent();
   return parent;
@@ skipping 49 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