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

ash/launcher/launcher.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_LAUNCHER_LAUNCHER_H_
 #define ASH_LAUNCHER_LAUNCHER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/background_animator.h"
 #include "ash/launcher/launcher_types.h"
@@ skipping 26 matching lines @@
 class LauncherIconObserver;
 class LauncherDelegate;
 class LauncherModel;
 
 class ASH_EXPORT Launcher  {
  public:
   Launcher(aura::Window* window_container,
            internal::ShelfLayoutManager* shelf_layout_manager);
   virtual ~Launcher();
 
+  // Return the launcher for the primary display.

[sky, 2012/10/17 16:25:20]

Document these may be NULL when not logged in.

[oshima, 2012/10/17 17:49:43]

Done.

+  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();
 
   void SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
   // Sets whether the launcher paints a background. Default is false, but is set
   // to true if a window overlaps the shelf.
   void SetPaintsBackground(
@@ skipping 79 matching lines @@
 
   // Used to animate the background.
   internal::BackgroundAnimator background_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(Launcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_H_