Move shelf/launcher/status_area_widget/panel_layout_manager to RootWindowController

ash/shell.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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 72 matching lines @@
 class AppListController;
 class CaptureController;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class FocusCycler;
 class MagnificationController;
 class MouseCursorEventFilter;
 class OutputConfiguratorAnimation;
 class OverlayEventFilter;
-class PanelLayoutManager;
 class ResizeShadowController;
 class RootWindowController;
 class RootWindowLayoutManager;
 class ScreenPositionController;
 class ShadowController;
 class ShelfLayoutManager;
 class ShellContextMenu;
 class SlowAnimationEventFilter;
 class StackingController;
 class StatusAreaWidget;
@@ skipping 72 matching lines @@
 
   static aura::Window* GetContainer(aura::RootWindow* root_window,
                                     int container_id);
   static const aura::Window* GetContainer(const aura::RootWindow* root_window,
                                           int container_id);
 
   // Returns the list of containers that match |container_id| in
   // 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;
   }
 
   // Adds or removes |filter| from the aura::Env's pre-target event-handler
   // list.
   void AddEnvEventFilter(aura::EventFilter* filter);
   void RemoveEnvEventFilter(aura::EventFilter* filter);
 
   // Shows the background menu over |widget|.
@@ skipping 104 matching lines @@
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     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_; }
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
 
   // Sets/gets the shelf auto-hide behavior.
   void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior);
   ShelfAutoHideBehavior GetShelfAutoHideBehavior() const;
 
   void SetShelfAlignment(ShelfAlignment alignment);
   ShelfAlignment GetShelfAlignment();
 
   // Dims or undims the screen.
   void SetDimming(bool should_dim);
 
   // Creates modal background, which is a partially-opaque fullscreen
   // window, on all displays.
   void CreateModalBackground();
 
   // Called when a modal window is removed. It will activate
   // another modal window if any, or remove modal screens
   // on all displays.
   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();
   SystemTray* system_tray();
 
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   internal::ResizeShadowController* resize_shadow_controller() {
@@ skipping 73 matching lines @@
 #if !defined(OS_MACOSX)
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
 
   scoped_ptr<AcceleratorController> accelerator_controller_;
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
   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_;
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
@@ skipping 39 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
 #endif  // defined(OS_CHROMEOS)
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_