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

ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
@@ skipping 30 matching lines @@
 // This class maintains the per root window state for ash. This class
 // owns the root window and other dependent objects that should be
 // deleted upon the deletion of the root window.  The RootWindowController
 // for particular root window is stored as a property and can be obtained
 // using |GetRootWindowController(aura::RootWindow*)| function.
 class ASH_EXPORT RootWindowController {
  public:
   explicit RootWindowController(aura::RootWindow* root_window);
   ~RootWindowController();
 
+  // Returns a RootWindowController that has a launcher for given
+  // |window|. This returns the RootWindowController for the |window|'s
+  // root window when multiple launcher mode is enabled, or the primary
+  // RootWindowController otherwise.
+  static RootWindowController* ForLauncher(aura::Window* window);
+
   aura::RootWindow* root_window() { return root_window_.get(); }
 
   RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); }
 
   Launcher* launcher() { return launcher_.get(); }
 
-  // TODO(sky): don't expose this!
-  internal::ShelfLayoutManager* shelf() const { return shelf_; }
+  ShelfLayoutManager* shelf() const { return shelf_; }
 
-  internal::StatusAreaWidget* status_area_widget() const {
+  StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
 
   // Returns the layout-manager for the appropriate modal-container. If the
   // window is inside the lockscreen modal container, then the layout manager
   // for that is returned. Otherwise the layout manager for the default modal
   // container is returned.
   // If no window is specified (i.e. |window| is NULL), then the lockscreen
   // modal container is used if the screen is currently locked. Otherwise, the
   // default modal container is used.
@@ skipping 47 matching lines @@
 
 private:
   // Creates each of the special window containers that holds windows of various
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::RootWindow* root_window);
 
   scoped_ptr<aura::RootWindow> root_window_;
   RootWindowLayoutManager* root_window_layout_;
 
   // Widget containing system tray.
-  internal::StatusAreaWidget* status_area_widget_;
+  StatusAreaWidget* status_area_widget_;
 
   // The shelf for managing the launcher and the status widget.
   // RootWindowController does not own the shelf. Instead, it is owned
   // by container of the status area.
-  internal::ShelfLayoutManager* shelf_;
+  ShelfLayoutManager* shelf_;
 
   // Manages layout of panels. Owned by PanelContainer.
-  internal::PanelLayoutManager* panel_layout_manager_;
+  PanelLayoutManager* panel_layout_manager_;
 
   scoped_ptr<Launcher> launcher_;
 
   // A background layer that's displayed beneath all other layers.  Without
   // this, portions of the root window that aren't covered by layers will be
   // painted white; this can show up if e.g. it takes a long time to decode the
   // desktop background image when displaying the login screen.
   scoped_ptr<ColoredWindowController> background_;
 
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_