Makes functions in container_finder take aura::Window

ash/mus/window_manager.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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 338 matching lines @@
 
 void WindowManager::OnWmSetModalType(aura::Window* window, ui::ModalType type) {
   ui::ModalType old_type = window->GetProperty(aura::client::kModalKey);
   if (type == old_type)
     return;
 
   window->SetProperty(aura::client::kModalKey, type);
   if (type != ui::MODAL_TYPE_SYSTEM && old_type != ui::MODAL_TYPE_SYSTEM)
     return;
 
-  WmWindow* new_parent =
-      wm::GetDefaultParent(WmWindow::Get(window), window->bounds());
+  aura::Window* new_parent = wm::GetDefaultParent(window, window->bounds());
   DCHECK(new_parent);
   if (window->parent())
     window->parent()->RemoveChild(window);
-  new_parent->aura_window()->AddChild(window);
+  new_parent->AddChild(window);
 }
 
 void WindowManager::OnWmSetCanFocus(aura::Window* window, bool can_focus) {
   NonClientFrameController* non_client_frame_controller =
       NonClientFrameController::Get(window);
   if (non_client_frame_controller)
     non_client_frame_controller->set_can_activate(can_focus);
 }
 
 aura::Window* WindowManager::OnWmCreateTopLevelWindow(
@@ skipping 186 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::Get()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::Get()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash