Move shelf/launcher/status_area_widget/panel_layout_manager to RootWindowController

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 11 matching lines @@
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/system/tray/system_tray.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/capture_controller.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/overlay_event_filter.h"
-#include "ash/wm/panel_layout_manager.h"
-#include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/shadow_controller.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/stacking_controller.h"
-#include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
@@ skipping 116 matching lines @@
 
 Shell::Shell(ShellDelegate* delegate)
     : screen_(new ScreenAsh),
       active_root_window_(NULL),
       delegate_(delegate),
 #if defined(OS_CHROMEOS)
       output_configurator_(new chromeos::OutputConfigurator()),
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
-      shelf_(NULL),
-      panel_layout_manager_(NULL),
-      status_area_widget_(NULL),
       browser_context_(NULL) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(internal::CreateUIControls());
 #if defined(OS_CHROMEOS)
   output_configurator_->AddObserver(output_configurator_animation_.get());
   base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(
       output_configurator());
 #endif  // defined(OS_CHROMEOS)
 }
 
@@ skipping 19 matching lines @@
   RemoveEnvEventFilter(system_gesture_filter_.get());
 #if !defined(OS_MACOSX)
   RemoveEnvEventFilter(accelerator_filter_.get());
 #endif
   if (touch_observer_hud_.get())
     RemoveEnvEventFilter(touch_observer_hud_.get());
 
   // TooltipController is deleted with the Shell so removing its references.
   RemoveEnvEventFilter(tooltip_controller_.get());
 
-  // The status area needs to be shut down before the windows are destroyed.
-  status_area_widget_->Shutdown();
-
   // AppList needs to be released before shelf layout manager, which is
   // destroyed with launcher container in the loop below. However, app list
   // container is now on top of launcher container and released after it.
   // TODO(xiyuan): Move it back when app list container is no longer needed.
   app_list_controller_.reset();
 
-
-  // Closing the windows frees the workspace controller.
-  shelf_->set_workspace_controller(NULL);
   // Destroy all child windows including widgets.
   display_controller_->CloseChildWindows();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical.
   drag_drop_controller_.reset();
   magnification_controller_.reset();
   power_button_controller_.reset();
   resize_shadow_controller_.reset();
   shadow_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
   window_cycle_controller_.reset();
   capture_controller_.reset();
   nested_dispatcher_controller_.reset();
   user_action_client_.reset();
   visibility_controller_.reset();
 
   // This also deletes all RootWindows.
   display_controller_.reset();
   screen_position_controller_.reset();
 
-  // Launcher widget has a InputMethodBridge that references to
-  // input_method_filter_'s input_method_. So explicitly release launcher_
-  // before input_method_filter_. And this needs to be after we delete all
-  // containers in case there are still live browser windows which access
-  // LauncherModel during close.
-  launcher_.reset();
-
   // Delete the activation controller after other controllers and launcher
   // because they might have registered ActivationChangeObserver.
   activation_controller_.reset();
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 
 #if defined(OS_CHROMEOS)
   output_configurator_->RemoveObserver(output_configurator_animation_.get());
   base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(
@@ skipping 69 matching lines @@
 
 // static
 std::vector<aura::Window*> Shell::GetAllContainers(int container_id) {
   std::vector<aura::Window*> containers;
   aura::Window* container = GetPrimaryRootWindow()->GetChildById(container_id);
   if (container)
     containers.push_back(container);
   return containers;
 }
 
+// static
+bool Shell::IsLauncherPerDisplayEnabled() {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  return command_line->HasSwitch(switches::kAshLauncherPerDisplay);
+}
+
 void Shell::Init() {
   // Install the custom factory first so that views::FocusManagers for Tray,
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
   env_filter_.reset(new aura::shared::CompoundEventFilter);
   AddEnvEventFilter(env_filter_.get());
 
   cursor_manager_.set_delegate(this);
 
   focus_manager_.reset(new aura::FocusManager);
   activation_controller_.reset(
       new internal::ActivationController(focus_manager_.get()));
 
+  focus_cycler_.reset(new internal::FocusCycler());
+
   screen_position_controller_.reset(new internal::ScreenPositionController);
   display_controller_.reset(new DisplayController);
   display_controller_->InitPrimaryDisplay();
   aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();
   active_root_window_ = root_window;
 
   cursor_manager_.SetDeviceScaleFactor(
       root_window->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
 
 #if !defined(OS_MACOSX)
@@ skipping 77 matching lines @@
 
   // Launcher must be created after secondary displays are initialized.
   display_controller_->InitSecondaryDisplays();
 
   // StatusAreaWidget uses Shell's CapsLockDelegate.
   if (delegate_.get())
     caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate());
   else
     caps_lock_delegate_.reset(new CapsLockDelegateStub);
 
-  // Initialize Primary RootWindow specific items.
-  status_area_widget_ = new internal::StatusAreaWidget();
-  status_area_widget_->CreateTrayViews(delegate_.get());
-  // Login screen manages status area visibility by itself.
-  if (delegate_.get() && delegate_->IsSessionStarted())
-    status_area_widget_->Show();
-
-  focus_cycler_.reset(new internal::FocusCycler());
-  focus_cycler_->AddWidget(status_area_widget_);
-
-  InitLayoutManagersForPrimaryDisplay(root_window_controller);
-
   if (!command_line->HasSwitch(switches::kAuraNoShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(new internal::ShadowController());
   }
 
-  if (!delegate_.get() || delegate_->IsUserLoggedIn())
-    CreateLauncher();
+  root_window_controller->InitForPrimaryDisplay();
 
   // Force Layout
   root_window_controller->root_window_layout()->OnWindowResized();
 
   // It needs to be created after OnWindowResized has been called, otherwise the
   // widget will not paint when restoring after a browser crash.  Also it needs
   // to be created after InitSecondaryDisplays() to initialize the wallpapers in
   // the correct size.
   user_wallpaper_delegate_->InitializeWallpaper();
 
@@ skipping 90 matching lines @@
 
 void Shell::OnAppTerminating() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnAppTerminating());
 }
 
 void Shell::OnLockStateChanged(bool locked) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
 }
 
 void Shell::CreateLauncher() {
-  if (launcher_.get())
-    return;
-
-  aura::Window* default_container =
-      GetPrimaryRootWindowController()->
-      GetContainer(internal::kShellWindowId_DefaultContainer);
-  launcher_.reset(new Launcher(default_container, shelf_));
-
-  launcher_->SetFocusCycler(focus_cycler_.get());
-  shelf_->SetLauncher(launcher_.get());
-  if (panel_layout_manager_)
-    panel_layout_manager_->SetLauncher(launcher_.get());
-
-  if (delegate())
-    launcher_->SetVisible(delegate()->IsSessionStarted());
-  launcher_->widget()->Show();
+  GetPrimaryRootWindowController()->CreateLauncher();
 }
 
 void Shell::ShowLauncher() {
-  if (!launcher_.get())
-    return;
-  launcher_->SetVisible(true);
+  GetPrimaryRootWindowController()->ShowLauncher();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+Launcher* Shell::launcher() {
+  return GetPrimaryRootWindowController()->launcher();
+}
+
 void Shell::UpdateShelfVisibility() {
-  shelf_->UpdateVisibilityState();
+  GetPrimaryRootWindowController()->UpdateShelfVisibility();
 }
 
 void Shell::SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior) {
-  shelf_->SetAutoHideBehavior(behavior);
+  GetPrimaryRootWindowController()->SetShelfAutoHideBehavior(behavior);
 }
 
 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior() const {
-  return shelf_->auto_hide_behavior();
+  return GetPrimaryRootWindowController()->GetShelfAutoHideBehavior();
 }
 
 void Shell::SetShelfAlignment(ShelfAlignment alignment) {
-  if (!shelf_->SetAlignment(alignment))
-    return;
-  FOR_EACH_OBSERVER(ShellObserver, observers_, OnShelfAlignmentChanged());
+  if (GetPrimaryRootWindowController()->SetShelfAlignment(alignment)) {
+    FOR_EACH_OBSERVER(ShellObserver, observers_, OnShelfAlignmentChanged());
+  }
 }
 
 ShelfAlignment Shell::GetShelfAlignment() {
-  return shelf_->alignment();
+  return GetPrimaryRootWindowController()->GetShelfAlignment();
 }
 
 void Shell::SetDimming(bool should_dim) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->screen_dimmer()->SetDimming(should_dim);
 }
 
 void Shell::CreateModalBackground() {
@@ skipping 17 matching lines @@
   }
   if (!activated) {
     RemoveEnvEventFilter(modality_filter_.get());
     modality_filter_.reset();
     for (RootWindowControllerList::iterator iter = controllers.begin();
          iter != controllers.end(); ++iter)
       (*iter)->GetSystemModalLayoutManager()->DestroyModalBackground();
   }
 }
 
+internal::ShelfLayoutManager* Shell::shelf() const {
+  return GetPrimaryRootWindowController()->shelf();
+}
+
+internal::StatusAreaWidget* Shell::status_area_widget() const {
+  return GetPrimaryRootWindowController()->status_area_widget();
+}
+
 SystemTrayDelegate* Shell::tray_delegate() {
-  return status_area_widget_->system_tray_delegate();
+  return status_area_widget()->system_tray_delegate();
 }
 
 SystemTray* Shell::system_tray() {
-  return status_area_widget_->system_tray();
+  return status_area_widget()->system_tray();
 }
 
 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
   root->set_focus_manager(focus_manager_.get());
   internal::RootWindowController* controller =
       new internal::RootWindowController(root);
   controller->CreateContainers();
   InitRootWindowController(controller);
   controller->root_window_layout()->OnWindowResized();
   desktop_background_controller_->OnRootWindowAdded(root);
@@ skipping 52 matching lines @@
           has_modal_background()) {
     controller->GetSystemModalLayoutManager()->CreateModalBackground();
   }
 
   window_cycle_controller_->OnRootWindowAdded(root_window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
-void Shell::InitLayoutManagersForPrimaryDisplay(
-    internal::RootWindowController* controller) {
-  DCHECK(status_area_widget_);
-
-  internal::ShelfLayoutManager* shelf_layout_manager =
-      new internal::ShelfLayoutManager(status_area_widget_);
-  controller->GetContainer(internal::kShellWindowId_LauncherContainer)->
-      SetLayoutManager(shelf_layout_manager);
-  shelf_ = shelf_layout_manager;
-
-  internal::StatusAreaLayoutManager* status_area_layout_manager =
-      new internal::StatusAreaLayoutManager(shelf_layout_manager);
-  controller->GetContainer(internal::kShellWindowId_StatusContainer)->
-      SetLayoutManager(status_area_layout_manager);
-
-  shelf_layout_manager->set_workspace_controller(
-      controller->workspace_controller());
-
-  // TODO(oshima): Support multiple displays.
-  controller->workspace_controller()->SetShelf(shelf());
-
-  // Create Panel layout manager
-  aura::Window* panel_container = GetContainer(
-      GetPrimaryRootWindow(),
-      internal::kShellWindowId_PanelContainer);
-  panel_layout_manager_ =
-      new internal::PanelLayoutManager(panel_container);
-  panel_container->SetEventFilter(
-      new internal::PanelWindowEventFilter(
-          panel_container, panel_layout_manager_));
-  panel_container->SetLayoutManager(panel_layout_manager_);
-}
-
 void Shell::SetCursor(gfx::NativeCursor cursor) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->SetCursor(cursor);
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 bool Shell::CanWindowReceiveEvents(aura::Window* window) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter) {
     if ((*iter)->GetSystemModalLayoutManager()->
             CanWindowReceiveEvents(window)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ash