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

ash/common/shelf/shelf_widget.h

Index: ash/common/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index e2e5c8c9e3ed40e68b33b5b5d080034774cd0953..1db458c9cf41e5d034b98bf46f9d2e52d9fef2c3 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -23,7 +23,6 @@ class ApplicationDragAndDropHost;
 namespace ash {
 class AppListButton;
 class FocusCycler;
-class Shelf;
 class ShelfLayoutManager;
 class ShelfView;
 class StatusAreaWidget;
@@ -63,10 +62,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
   void SetDimsShelf(bool dimming);
   bool GetDimsShelf() const;
 
-  // TODO(jamescook): Eliminate these.
-  Shelf* shelf() { return shelf_; }
-  void set_shelf(Shelf* shelf) { shelf_ = shelf; }
-
   ShelfLayoutManager* shelf_layout_manager() { return shelf_layout_manager_; }
   StatusAreaWidget* status_area_widget() const { return status_area_widget_; }
 
@@ -135,8 +130,6 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
 
   // Owned by the shelf container's window.
   ShelfLayoutManager* shelf_layout_manager_;
-  // Owned by the root window controller.
-  Shelf* shelf_;
   StatusAreaWidget* status_area_widget_;
 
   // |delegate_view_| is the contents view of this widget and is cleaned up