mash: remove more shell/shelf WmWindow usage.

chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.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 "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
@@ skipping 213 matching lines @@
       ChromeLauncherController::instance();
   // The shelf animation duration override.
   int duration_override = animation_speed_ms_;
   // Handle the shelf order of items. This is done once the old user is hidden.
   if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) {
     // Some unit tests have no ChromeLauncherController.
     if (chrome_launcher_controller)
       chrome_launcher_controller->ActiveUserChanged(
           new_account_id_.GetUserEmail());
     // Hide the black rectangle on top of each shelf again.
-    for (ash::WmWindow* window : ash::ShellPort::Get()->GetAllRootWindows()) {
+    for (aura::Window* window : ash::Shell::GetAllRootWindows()) {
       ash::ShelfWidget* shelf = ash::WmShelf::ForWindow(window)->shelf_widget();
       shelf->HideShelfBehindBlackBar(false, duration_override);
     }
     // We kicked off the shelf animation above and the override can be
     // removed.
     duration_override = 0;
   }
 
   if (!animation_speed_ms_ || animation_step == ANIMATION_STEP_FINALIZE)
     return;
@@ skipping 12 matching lines @@
     return;
 
   // For each root window hide the shelf.
   for (aura::Window* window : ash::Shell::GetAllRootWindows()) {
     // Hiding the shelf will cause a resize on a maximized window.
     // If the shelf is then shown for the following user in the same location,
     // the window gets resized again. Since each resize can cause a considerable
     // CPU usage and therefore effect jank, we should avoid hiding the shelf if
     // the start and end location are the same and cover the shelf instead with
     // a black rectangle on top.
-    ash::WmShelf* shelf = ash::WmShelf::ForWindow(ash::WmWindow::Get(window));
+    ash::WmShelf* shelf = ash::WmShelf::ForWindow(window);
     if (GetScreenCover(window) != NO_USER_COVERS_SCREEN &&
         (!chrome_launcher_controller ||
          !chrome_launcher_controller->ShelfBoundsChangesProbablyWithUser(
              shelf, new_account_id_))) {
       shelf->shelf_widget()->HideShelfBehindBlackBar(true, duration_override);
     } else {
       // This shelf change is only part of the animation and will be updated by
       // ChromeLauncherController::ActiveUserChanged() to the new users value.
       // Note that the user preference will not be changed.
       shelf->SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
@@ skipping 157 matching lines @@
         if (itr != window_to_entry_map.end()) {
           windows_by_account_id_[itr->second->show_for_user()].push_back(
               child_window);
         }
       }
     }
   }
 }
 
 }  // namespace chrome