Removes a couple more functions from WmWindow

ash/wm/default_state.cc

 // Copyright 2014 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/default_state.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_animation_types.h"
 #include "ash/wm/window_parenting_utils.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_util.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm/wm_screen_util.h"
 #include "ash/wm_window.h"
+#include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 // This specifies how much percent (30%) of a window rect
 // must be visible when the window is added to the workspace.
 const float kMinimumPercentOnScreenArea = 0.3f;
@@ skipping 17 matching lines @@
   // display it should be restored, so this is best guess.
   // TODO(oshima): Restore information should contain the
   // work area information like WindowResizer does for the
   // last window location.
   gfx::Rect display_area =
       window_state->window()->GetDisplayNearestWindow().bounds();
 
   if (!display_area.Intersects(restore_bounds)) {
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayMatching(restore_bounds);
-    WmWindow* new_root =
-        ShellPort::Get()->GetRootWindowForDisplayId(display.id());
-    if (new_root != window_state->window()->GetRootWindow()) {
-      WmWindow* new_container = new_root->GetChildByShellWindowId(
-          window_state->window()->GetParent()->GetShellWindowId());
-      new_container->AddChild(window_state->window());
+    RootWindowController* new_root_controller =
+        Shell::Get()->GetRootWindowControllerWithDisplayId(display.id());
+    if (new_root_controller->GetRootWindow() !=
+        window_state->window()->GetRootWindow()->aura_window()) {
+      aura::Window* new_container =
+          new_root_controller->GetRootWindow()->GetChildById(
+              window_state->window()->GetParent()->aura_window()->id());
+      new_container->AddChild(window_state->window()->aura_window());
     }
   }
 }
 
 void CycleSnap(WindowState* window_state, WMEventType event) {
   wm::WindowStateType desired_snap_state =
       event == WM_EVENT_CYCLE_SNAP_LEFT ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED
                                         : wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED;
 
   if (window_state->CanSnap() &&
@@ skipping 614 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash