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

chrome/browser/chromeos/accessibility/chromevox_panel.cc

Index: chrome/browser/chromeos/accessibility/chromevox_panel.cc
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
index bf1e5d4b3c133cf1cc6ec8fa8369fa0939775ae6..4f5f22672dd3397fdc493364f332b541eab44bfb 100644
--- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc
+++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -4,8 +4,8 @@
 
 #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"
@@ -116,9 +116,9 @@ void ChromeVoxPanel::DidFirstVisuallyNonEmptyPaint() {
 }
 
 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();