mash: remove more shell/shelf WmWindow usage.

ash/wm/window_util.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/window_util.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
@@ skipping 79 matching lines @@
 }
 
 void PinWindow(aura::Window* window, bool trusted) {
   wm::WMEvent event(trusted ? wm::WM_EVENT_TRUSTED_PIN : wm::WM_EVENT_PIN);
   wm::GetWindowState(window)->OnWMEvent(&event);
 }
 
 void SetAutoHideShelf(aura::Window* window, bool autohide) {
   wm::GetWindowState(window)->set_autohide_shelf_when_maximized_or_fullscreen(
       autohide);
-  for (WmWindow* root_window : ShellPort::Get()->GetAllRootWindows())
+  for (aura::Window* root_window : Shell::GetAllRootWindows())
     WmShelf::ForWindow(root_window)->UpdateVisibilityState();
 }
 
 bool MoveWindowToDisplay(aura::Window* window, int64_t display_id) {
   DCHECK(window);
-  WmWindow* root = ShellPort::Get()->GetRootWindowForDisplayId(display_id);
-  return root && MoveWindowToRoot(window, root->aura_window());
+  aura::Window* root = ShellPort::Get()->GetRootWindowForDisplayId(display_id);
+  return root && MoveWindowToRoot(window, root);
 }
 
 bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
   DCHECK(window);
   views::View* target = static_cast<views::View*>(event.target());
   if (!target)
     return false;
   aura::Window* root = target->GetWidget()->GetNativeView()->GetRootWindow();
   return root && MoveWindowToRoot(window, root);
 }
@@ skipping 12 matching lines @@
 }
 
 void SetSnapsChildrenToPhysicalPixelBoundary(aura::Window* container) {
   DCHECK(!container->GetProperty(kSnapChildrenToPixelBoundary))
       << container->GetName();
   container->SetProperty(kSnapChildrenToPixelBoundary, true);
 }
 
 }  // namespace wm
 }  // namespace ash