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

ash/launcher/launcher.h

Index: ash/launcher/launcher.h
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 452730f3b6ce59434431949d1feb9c0a8b91958a..12506bf63b6accc402fe972acf1ebeb8eb50535d 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -44,6 +44,12 @@ class ASH_EXPORT Launcher  {
            internal::ShelfLayoutManager* shelf_layout_manager);
   virtual ~Launcher();
 
+  // Return the launcher for the primary display.
+  static Launcher* ForPrimaryDisplay();
+
+  // Return the launcher for the display that |window| is currently on.
+  static Launcher* ForWindow(aura::Window* window);
+
   // Sets the focus cycler.  Also adds the launcher to the cycle.
   void SetFocusCycler(internal::FocusCycler* focus_cycler);
   internal::FocusCycler* GetFocusCycler();