Remove Shell::shelf()|status_area_widget()|launcher()

ash/wm/shelf_layout_manager.h

Index: ash/wm/shelf_layout_manager.h
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index c0b57f841283e938f65579dbdb2b4c095704e96b..6b9eb08d4d6e0665ed807b5f3ac62cdc0c1b5854 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -27,15 +27,12 @@ namespace ui {
 class GestureEvent;
 }
 
-namespace views {
-class Widget;
-}
-
 namespace ash {
 class ScreenAsh;
 namespace internal {
 
 class ShelfLayoutManagerTest;
+class StatusAreaWidget;
 class WorkspaceController;
 
 // ShelfLayoutManager is the layout manager responsible for the launcher and
@@ -88,7 +85,7 @@ class ASH_EXPORT ShelfLayoutManager :
   // Size of the shelf when auto-hidden.
   static const int kAutoHideSize;
 
-  explicit ShelfLayoutManager(views::Widget* status);
+  explicit ShelfLayoutManager(StatusAreaWidget* status);
   virtual ~ShelfLayoutManager();
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
@@ -112,7 +109,7 @@ class ASH_EXPORT ShelfLayoutManager :
   const views::Widget* launcher_widget() const {
     return launcher_ ? launcher_->widget() : NULL;
   }
-  views::Widget* status() { return status_; }
+  StatusAreaWidget* status_area_widget() { return status_area_widget_; }
 
   bool in_layout() const { return in_layout_; }
 
@@ -277,7 +274,7 @@ class ASH_EXPORT ShelfLayoutManager :
   State state_;
 
   Launcher* launcher_;
-  views::Widget* status_;
+  StatusAreaWidget* status_area_widget_;
 
   WorkspaceController* workspace_controller_;