Add 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_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 62 matching lines @@
 class UserWallpaperDelegate;
 class VideoDetector;
 class WindowCycleController;
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
 class DragDropController;
-class EventClientImpl;
 class FocusCycler;
 class KeyRewriterEventFilter;
 class MagnificationController;
 class MonitorController;
 class PanelLayoutManager;
 class PartialScreenshotEventFilter;
 class ResizeShadowController;
+class RootWindowController;
 class RootWindowLayoutManager;
-class ScreenDimmer;
 class ShadowController;
 class ShelfLayoutManager;
 class ShellContextMenu;
 class SlowAnimationEventFilter;
 class SystemGestureEventFilter;
 class StackingController;
 class StatusAreaWidget;
 class TooltipController;
 class TouchObserverHUD;
 class VisibilityController;
@@ skipping 34 matching lines @@
   static Shell* CreateInstance(ShellDelegate* delegate);
 
   // Should never be called before |CreateInstance()|.
   static Shell* GetInstance();
 
   // Returns true if the ash shell has been instantiated.
   static bool HasInstance();
 
   static void DeleteInstance();
 
+  // Returns the root window controller for primary root window.

[Daniel Erat, 2012/06/13 01:36:28]

nit: s/for primary/for the primary/

[oshima, 2012/06/13 05:52:37]

Done.

+  static internal::RootWindowController* GetPrimaryRootWindowController();
+
   // Gets the primary RootWindow. The primary RootWindow is the one
   // that has a launcher.
   static aura::RootWindow* GetPrimaryRootWindow();
 
   // Gets the active RootWindow. The active RootWindow is the one that
   // contains the current active window as a decendant child. The active
   // RootWindow remains the same even when the active window becomes NULL,
   // until the another window who has a different root window becomes active.
   static aura::RootWindow* GetActiveRootWindow();
 
   // Gets the RootWindow at |point| in the virtual screen coordinates.
   // Returns NULL if the root window does not exist at the given
   // point.
   static aura::RootWindow* GetRootWindowAt(const gfx::Point& point);
 
   static aura::Window* GetContainer(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);
 
   void set_active_root_window(aura::RootWindow* active_root_window) {
     active_root_window_ = active_root_window;
   }
 
-  internal::RootWindowLayoutManager* root_window_layout() const {
-    return root_window_layout_;
-  }
-
   // Adds or removes |filter| from the aura::Env's CompoundEventFilter.
   void AddEnvEventFilter(aura::EventFilter* filter);
   void RemoveEnvEventFilter(aura::EventFilter* filter);
   size_t GetEnvEventFilterCount() const;
 
   // Shows the background menu over |widget|.
   void ShowBackgroundMenu(views::Widget* widget, const gfx::Point& location);
 
   // Toggles app list.
   void ToggleAppList();
@@ skipping 89 matching lines @@
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     return magnification_controller_.get();
   }
 
-  internal::ScreenDimmer* screen_dimmer() {
-    return screen_dimmer_.get();
-  }
-
   Launcher* launcher() { return launcher_.get(); }
 
   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();
 
+  // Dim or undim the screen.

[Daniel Erat, 2012/06/13 01:36:28]

nit: Dims or undims

[oshima, 2012/06/13 05:52:37]

Done.

+  void SetDimming(bool should_dim);
+
   // TODO(sky): don't expose this!
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
   internal::StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
 
   // Convenience accessor for members of StatusAreaWidget.
   SystemTrayDelegate* tray_delegate();
   SystemTray* system_tray();
 
   // Returns the size of the grid.
   int GetGridSize() const;
 
-  // Returns true if in maximized or fullscreen mode.
-  bool IsInMaximizedMode() const;
-
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   internal::ResizeShadowController* resize_shadow_controller() {
     return resize_shadow_controller_.get();
   }
 
   // Made available for tests.
   internal::ShadowController* shadow_controller() {
@@ skipping 10 matching lines @@
 
 #if defined(OS_CHROMEOS)
   chromeos::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
  private:
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
+  friend class internal::RootWindowController;
 
   typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
 
   explicit Shell(ShellDelegate* delegate);
   virtual ~Shell();
 
   void Init();
 
-  // Initializes the layout managers and event filters.
-  void InitLayoutManagers();
+  // Initiailze the root window so that it can host browser windows.
+  void InitRootWindow(aura::RootWindow* root);
+
+  // Initializes the layout managers and event filters specific for
+  // primary display.
+  void InitLayoutManagersForPrimaryDisplay(
+      internal::RootWindowController* root_window_controller);
 
   // Disables the workspace grid layout.
   void DisableWorkspaceGridLayout();
 
   // aura::CursorManager::Delegate overrides:
   virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void ShowCursor(bool visible) OVERRIDE;
 
   static Shell* instance_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
-  scoped_ptr<aura::RootWindow> root_window_;
+  scoped_ptr<internal::RootWindowController> root_window_controller_;
   ScreenAsh* screen_;
 
   // Active root window. Never become NULL.
   aura::RootWindow* active_root_window_;
 
   // The CompoundEventFilter owned by aura::Env object.
   aura::shared::CompoundEventFilter* env_filter_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
 #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<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::WorkspaceController> workspace_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<UserActivityDetector> user_activity_detector_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
-  scoped_ptr<internal::EventClientImpl> event_client_;
   scoped_ptr<internal::MonitorController> monitor_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<internal::MagnificationController> magnification_controller_;
-  scoped_ptr<internal::ScreenDimmer> screen_dimmer_;
   scoped_ptr<aura::FocusManager> focus_manager_;
   scoped_ptr<aura::client::UserActionClient> user_action_client_;
 
   // An event filter that rewrites or drops a key event.
   scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI is active.
   scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
 
@@ skipping 24 matching lines @@
   // 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_;
 
-  // Owned by aura::RootWindow, cached here for type safety.
-  internal::RootWindowLayoutManager* root_window_layout_;
-
   // 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_