Removes a couple more functions from WmWindow

ash/wm/window_positioning_utils.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/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 32 matching lines @@
                     IsWindowOrAncestorLockedToRoot(window->GetParent()));
 }
 
 // Move all transient children to |dst_root|, including the ones in
 // the child windows and transient children of the transient children.
 void MoveAllTransientChildrenToNewRoot(const display::Display& display,
                                        WmWindow* window) {
   WmWindow* dst_root =
       Shell::GetRootWindowControllerWithDisplayId(display.id())->GetWindow();
   for (WmWindow* transient_child : window->GetTransientChildren()) {
-    const int container_id = transient_child->GetParent()->GetShellWindowId();
+    const int container_id = transient_child->GetParent()->aura_window()->id();
     DCHECK_GE(container_id, 0);
     WmWindow* container = dst_root->GetChildByShellWindowId(container_id);
     const gfx::Rect transient_child_bounds_in_screen =
         transient_child->GetBoundsInScreen();
     container->AddChild(transient_child);
     transient_child->SetBoundsInScreen(transient_child_bounds_in_screen,
                                        display);
 
     // Transient children may have transient children.
     MoveAllTransientChildrenToNewRoot(display, transient_child);
@@ skipping 73 matching lines @@
   //    display.
   if (!window->GetTransientParent() &&
       !IsWindowOrAncestorLockedToRoot(window)) {
     RootWindowController* dst_root_window_controller =
         Shell::GetRootWindowControllerWithDisplayId(display.id());
     DCHECK(dst_root_window_controller);
     WmWindow* dst_root = dst_root_window_controller->GetWindow();
     DCHECK(dst_root);
     WmWindow* dst_container = nullptr;
     if (dst_root != window->GetRootWindow()) {
-      int container_id = window->GetParent()->GetShellWindowId();
+      int container_id = window->GetParent()->aura_window()->id();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
       if (!SystemModalContainerLayoutManager::IsModalBackground(window))
         dst_container = dst_root->GetChildByShellWindowId(container_id);
     }
 
     if (dst_container && window->GetParent() != dst_container) {
       WmWindow* focused = WmWindow::Get(GetFocusedWindow());
       WmWindow* active = WmWindow::Get(GetActiveWindow());
@@ skipping 33 matching lines @@
   }
   gfx::Point origin(bounds_in_screen.origin());
   const gfx::Point display_origin =
       window->GetDisplayNearestWindow().bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds_in_screen.size()));
 }
 
 }  // namespace wm
 }  // namespace ash