Move shelf/launcher/status_area_widget/panel_layout_manager to RootWindowController

Move shelf/launcher/status_area_widget/panel_layout_manager to RootWindowController
 This is just preparation to create launchers on all displays.

BUG=145978
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161621

[oshima, 2012-10-10 22:39:19]

http://codereview.chromium.org/11093050/diff/16/ash/shell.h
File ash/shell.h (left):

http://codereview.chromium.org/11093050/diff/16/ash/shell.h#oldcode338
ash/shell.h:338: }
Methods whose body have been moved to RootWindowController will be removed in
following CLs.

[sky, 2012-10-11 00:35:20]

Before reviewing this I want to understand where we plan on going with this
work. I started a separate thread.

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

LGTM. You need to straighten out the models/LauncherDelegate before enabling the
launcher on secondary monitors.

http://codereview.chromium.org/11093050/diff/10008/ash/ash_switches.cc
File ash/ash_switches.cc (right):

http://codereview.chromium.org/11093050/diff/10008/ash/ash_switches.cc#newcode38
ash/ash_switches.cc:38: const char kAshMultipleLaunchers[] =
"ash-multiple-launchers";
Can we name this ash-launcher-per-display?

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller.cc
File ash/root_window_controller.cc (right):

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller...
ash/root_window_controller.cc:182: // Launcher widget has a InputMethodBridge
that references to
a -> an

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller...
ash/root_window_controller.cc:183: // input_method_filter_'s input_method_. So
explicitly release launcher_
|s around references to fields/params

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h
File ash/shell.h (right):

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h#newcode186
ash/shell.h:186: static bool IsMultipleLaunchersEnabled();
areMultipleLauncherEnabled

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h#newcode312
ash/shell.h:312: Launcher* launcher();
This is now dangerous. Can we remove it? If it's too much now, add a TODO.

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

http://codereview.chromium.org/11093050/diff/10008/ash/ash_switches.cc
File ash/ash_switches.cc (right):

http://codereview.chromium.org/11093050/diff/10008/ash/ash_switches.cc#newcode38
ash/ash_switches.cc:38: const char kAshMultipleLaunchers[] =
"ash-multiple-launchers";
On 2012/10/11 16:38:25, sky wrote:
> Can we name this ash-launcher-per-display?

Done.

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller.cc
File ash/root_window_controller.cc (right):

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller...
ash/root_window_controller.cc:182: // Launcher widget has a InputMethodBridge
that references to
On 2012/10/11 16:38:25, sky wrote:
> a -> an

Done.

http://codereview.chromium.org/11093050/diff/10008/ash/root_window_controller...
ash/root_window_controller.cc:183: // input_method_filter_'s input_method_. So
explicitly release launcher_
On 2012/10/11 16:38:25, sky wrote:
> |s around references to fields/params

Done.

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h
File ash/shell.h (right):

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h#newcode186
ash/shell.h:186: static bool IsMultipleLaunchersEnabled();
On 2012/10/11 16:38:25, sky wrote:
> areMultipleLauncherEnabled

Changed to IsLauncherPerDisplayEnabled. Is this ok?

http://codereview.chromium.org/11093050/diff/10008/ash/shell.h#newcode312
ash/shell.h:312: Launcher* launcher();
I'm going to remove these methods from Shell
in subsequent CLs. Added TODO.

[sky, 2012-10-11 21:28:55]

IsLauncherPerDisplayEnabled LGTM

[commit-bot: I haz the power, 2012-10-12 08:09:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11093050/14001

[commit-bot: I haz the power, 2012-10-12 08:09:06]

Failed to apply patch for ash/root_window_controller.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/root_window_controller.h
  Hunk #2 FAILED at 23.
  1 out of 6 hunks FAILED -- saving rejects to file
ash/root_window_controller.h.rej

Patch:       ash/root_window_controller.h
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index
c88795d565541ecc93086dd9cd1a2ce91ae61126..cc1ce4ce2379f29a0bc86605bb8ca6f723643565
100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -6,6 +6,7 @@
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
+#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -22,11 +23,16 @@ class RootWindowEventFilter;
 }  // namespace aura
 
 namespace ash {
+class Launcher;
 class ToplevelWindowEventHandler;
+
 namespace internal {
 
+class PanelLayoutManager;
 class RootWindowLayoutManager;
 class ScreenDimmer;
+class ShelfLayoutManager;
+class StatusAreaWidget;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
 class WorkspaceController;
@@ -41,20 +47,23 @@ class ASH_EXPORT RootWindowController {
   explicit RootWindowController(aura::RootWindow* root_window);
   ~RootWindowController();
 
-  aura::RootWindow* root_window() {
-    return root_window_.get();
-  }
+  aura::RootWindow* root_window() { return root_window_.get(); }
 
-  RootWindowLayoutManager* root_window_layout() {
-    return root_window_layout_;
-  }
+  RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
-  ScreenDimmer* screen_dimmer() {
-    return screen_dimmer_.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_; }
+
+  internal::StatusAreaWidget* status_area_widget() const {
+    return status_area_widget_;
   }
 
   SystemModalContainerLayoutManager* GetSystemModalLayoutManager();
@@ -64,10 +73,20 @@ class ASH_EXPORT RootWindowController {
   void InitLayoutManagers();
   void CreateContainers();
 
+  // Initializs the RootWindowController for primary display. This
+  // creates
+  void InitForPrimaryDisplay();
+
   // Initializes |background_|.  |is_first_run_after_boot| determines the
   // background's initial color.
   void CreateSystemBackground(bool is_first_run_after_boot);
 
+  // Initializes |launcher_|.  Does nothing if it's already initialized.
+  void CreateLauncher();
+
+  // Show launcher view if it was created hidden (before session has started).
+  void ShowLauncher();
+
   // Updates |background_| to be black after the desktop background is visible.
   void HandleDesktopBackgroundVisible();
 
@@ -86,7 +105,18 @@ class ASH_EXPORT RootWindowController {
   // Moves child windows to |dest|.
   void MoveWindowsTo(aura::RootWindow* dest);
 
- private:
+  // 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;
+
+  // Sets/gets the shelf alignemnt.
+  bool SetShelfAlignment(ShelfAlignment alignment);
+  ShelfAlignment GetShelfAlignment();
+
+private:
   // Creates each of the special window containers that holds windows of
various
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::RootWindow* root_window);
@@ -94,6 +124,19 @@ class ASH_EXPORT RootWindowController {
   scoped_ptr<aura::RootWindow> root_window_;
   RootWindowLayoutManager* root_window_layout_;
 
+  // Widget containing system tray.
+  internal::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_;
+
+  // Manages layout of panels. Owned by PanelContainer.
+  internal::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

[commit-bot: I haz the power, 2012-10-12 08:57:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11093050/16002

[commit-bot: I haz the power, 2012-10-12 09:33:25]

Sorry for I got bad news for ya.
Compile failed with a clobber build.
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-12 16:32:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11093050/25001

[commit-bot: I haz the power, 2012-10-12 18:42:30]

Change committed as 161621