mash: remove more shell/shelf WmWindow usage.

chrome/browser/chromeos/accessibility/chromevox_panel.cc

 // Copyright 2015 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/chromeos/accessibility/chromevox_panel.h"
 
 #include "ash/accessibility_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 114 matching lines @@
 void ChromeVoxPanel::Close() {
   widget_->Close();
 }
 
 void ChromeVoxPanel::DidFirstVisuallyNonEmptyPaint() {
   widget_->Show();
   UpdatePanelHeight();
 }
 
 void ChromeVoxPanel::UpdatePanelHeight() {
-  ash::WmShelf* shelf =
-      ash::WmShelf::ForWindow(ash::WmWindow::Get(GetRootWindow()));
+  ash::WmShelf* shelf = ash::WmShelf::ForWindow(GetRootWindow());
   if (!shelf->IsShelfInitialized())
     return;
 
   ash::ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager();
   if (shelf_layout_manager)
     shelf_layout_manager->SetChromeVoxPanelHeight(kPanelHeight);
 }
 
 void ChromeVoxPanel::EnterFullscreen() {
   Focus();
@@ skipping 48 matching lines @@
   // If we're in full-screen mode, give the panel a height of 0 unless
   // it's active.
   if (ash::GetRootWindowController(GetRootWindow())
           ->GetWindowForFullscreenMode() &&
       !widget_->IsActive()) {
     bounds.set_height(0);
   }
 
   widget_->SetBounds(bounds);
 }