Cleanup ash shelf accessor functions.

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 "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
@@ skipping 83 matching lines @@
 aura::Window* ChromeVoxPanel::GetRootWindow() {
   return GetWidget()->GetNativeWindow()->GetRootWindow();
 }
 
 void ChromeVoxPanel::Close() {
   widget_->Close();
 }
 
 void ChromeVoxPanel::DidFirstVisuallyNonEmptyPaint() {
   widget_->Show();
-  ash::ShelfLayoutManager::ForShelf(GetRootWindow())
+  ash::Shelf::ForWindow(GetRootWindow())
+      ->shelf_layout_manager()
       ->SetChromeVoxPanelHeight(kPanelHeight);
 }
 
 void ChromeVoxPanel::EnterFullscreen() {
   fullscreen_ = true;
   widget_->widget_delegate()->set_can_activate(true);
   widget_->Activate();
   web_view_->RequestFocus();
   UpdateWidgetBounds();
 }
@@ skipping 29 matching lines @@
                                              uint32_t changed_metrics) {
   UpdateWidgetBounds();
 }
 
 void ChromeVoxPanel::UpdateWidgetBounds() {
   gfx::Rect bounds(GetRootWindow()->bounds().size());
   if (!fullscreen_)
     bounds.set_height(kPanelHeight);
   widget_->SetBounds(bounds);
 }