Move shelf/launcher/status_area_widget/panel_layout_manager to RootWindowController

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 044ba06d5c4d6ba79b2fd7d444aa21cf44810819..3b82698516437c7fb16012c665f7737e6dfee591 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -90,7 +90,6 @@ class MagnificationController;
 class MouseCursorEventFilter;
 class OutputConfiguratorAnimation;
 class OverlayEventFilter;
-class PanelLayoutManager;
 class ResizeShadowController;
 class RootWindowController;
 class RootWindowLayoutManager;
@@ -183,6 +182,9 @@ class ASH_EXPORT Shell : CursorDelegate,
   // all root windows.
   static std::vector<aura::Window*> GetAllContainers(int container_id);
 
+  // True if multiple launchers is enabled.
+  static bool IsMultipleLaunchersEnabled();

[sky, 2012/10/11 16:38:25]

areMultipleLauncherEnabled

[oshima, 2012/10/11 20:19:51]

Changed to IsLauncherPerDisplayEnabled. Is this ok?

+
   void set_active_root_window(aura::RootWindow* active_root_window) {
     active_root_window_ = active_root_window;
   }
@@ -307,7 +309,7 @@ class ASH_EXPORT Shell : CursorDelegate,
     return magnification_controller_.get();
   }
 
-  Launcher* launcher() { return launcher_.get(); }
+  Launcher* launcher();

[sky, 2012/10/11 16:38:25]

This is now dangerous. Can we remove it? If it's too much now, add a TODO.

[oshima, 2012/10/11 20:19:51]

I'm going to remove these methods from Shell
in subsequent CLs. Added TODO.

 
   const ScreenAsh* screen() { return screen_; }
 
@@ -334,11 +336,9 @@ class ASH_EXPORT Shell : CursorDelegate,
   void OnModalWindowRemoved(aura::Window* removed);
 
   // TODO(sky): don't expose this!
-  internal::ShelfLayoutManager* shelf() const { return shelf_; }
+  internal::ShelfLayoutManager* shelf() const;
 
-  internal::StatusAreaWidget* status_area_widget() const {
-    return status_area_widget_;
-  }
+  internal::StatusAreaWidget* status_area_widget() const;
 
   // Convenience accessor for members of StatusAreaWidget.
   SystemTrayDelegate* tray_delegate();
@@ -432,8 +432,6 @@ class ASH_EXPORT Shell : CursorDelegate,
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
 
-  scoped_ptr<Launcher> launcher_;
-
   scoped_ptr<internal::AppListController> app_list_controller_;
 
   scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
@@ -493,19 +491,8 @@ class ASH_EXPORT Shell : CursorDelegate,
 
   CursorManager cursor_manager_;
 
-  // The shelf for managing the launcher and the status widget in non-compact
-  // mode. Shell does not own the shelf. Instead, it is owned by container of
-  // the status area.
-  internal::ShelfLayoutManager* shelf_;
-
-  // Manages layout of panels. Owned by PanelContainer.
-  internal::PanelLayoutManager* panel_layout_manager_;
-
   ObserverList<ShellObserver> observers_;
 
-  // Widget containing system tray.
-  internal::StatusAreaWidget* status_area_widget_;
-
   // Used by ash/shell.
   content::BrowserContext* browser_context_;