ash: Remove ash::Shelf in favor of ash::WmShelf

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/aura/wm_window_aura.h"
 #include "ash/common/accessibility_types.h"
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.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 90 matching lines @@
 void ChromeVoxPanel::Close() {
   widget_->Close();
 }
 
 void ChromeVoxPanel::DidFirstVisuallyNonEmptyPaint() {
   widget_->Show();
   UpdatePanelHeight();
 }
 
 void ChromeVoxPanel::UpdatePanelHeight() {
-  ash::Shelf* shelf =
-      ash::Shelf::ForWindow(ash::WmWindowAura::Get(GetRootWindow()));
-  if (!shelf)
+  ash::WmShelf* shelf =
+      ash::WmShelf::ForWindow(ash::WmWindowAura::Get(GetRootWindow()));
+  if (!shelf->IsShelfCreated())

[msw, 2016/08/30 22:02:07]

nit: maybe skip this and just let the shelf layout manager check suffice.

[James Cook, 2016/08/30 23:00:57]

ditto

     return;
 
   ash::ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager();
   if (shelf_layout_manager)
     shelf_layout_manager->SetChromeVoxPanelHeight(kPanelHeight);
 }
 
 void ChromeVoxPanel::EnterFullscreen() {
   Focus();
   panel_fullscreen_ = true;
@@ skipping 47 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);
 }