mash: remove more shell/shelf WmWindow usage.

ash/wm/workspace_controller.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/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 43 matching lines @@
 }
 
 wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!viewport_ || !RootWindowController::ForWindow(viewport_)->HasShelf())
     return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const aura::Window* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
   if (fullscreen && !wm::GetWindowState(fullscreen)->ignored_by_shelf())
     return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
 
-  const gfx::Rect shelf_bounds(
-      WmShelf::ForWindow(WmWindow::Get(viewport_))->GetIdealBounds());
+  const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds());
   bool window_overlaps_launcher = false;
   // The default container may contain windows that may overlap the launcher
   // shelf and affect its transparency.
   aura::Window* container =
       viewport_->GetRootWindow()->GetChildById(kShellWindowId_DefaultContainer);
   for (aura::Window* window : container->children()) {
     wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_state->ignored_by_shelf() ||
         (window->layer() && !window->layer()->GetTargetVisibility())) {
       continue;
@@ skipping 44 matching lines @@
 void WorkspaceController::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, viewport_);
   viewport_->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
   layout_manager_ = nullptr;
 }
 
 }  // namespace ash