Switch primary display

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 177 matching lines @@
       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());
-  static_cast<internal::MultiDisplayManager*>(
-      aura::Env::GetInstance()->display_manager())->InitInternalDisplayInfo();

[oshima, 2012/09/18 09:30:48]

I moved this to MultiDisplayManager's constructor.

 #endif  // defined(OS_CHROMEOS)
 }
 
 Shell::~Shell() {
   views::FocusManagerFactory::Install(NULL);
 
   // Remove the focus from any window. This will prevent overhead and side
   // effects (e.g. crashes) from changing focus during shutdown.
   // See bug crbug.com/134502.
   if (active_root_window_)
@@ skipping 233 matching lines @@
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(
       new WindowCycleController(activation_controller_.get()));
 
   tooltip_controller_.reset(new internal::TooltipController(
       drag_drop_controller_.get()));
   AddEnvEventFilter(tooltip_controller_.get());
 
   InitRootWindowController(root_window_controller);
 
+  // This controller needs to be set before SetupManagedWindowMode.
+  desktop_background_controller_.reset(new DesktopBackgroundController());
+  if (delegate_.get())
+    user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
+  if (!user_wallpaper_delegate_.get())
+    user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
+
+  // 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_);
 
-  // This controller needs to be set before SetupManagedWindowMode.
-  desktop_background_controller_.reset(new DesktopBackgroundController());
-  if (delegate_.get())
-    user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
-  if (!user_wallpaper_delegate_.get())
-    user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
-
   InitLayoutManagersForPrimaryDisplay(root_window_controller);
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(new internal::ShadowController());
   }
 
-  // Launcher must be created after secondary displays are initialized.
-  display_controller_->InitSecondaryDisplays();
-
   if (!delegate_.get() || delegate_->IsUserLoggedIn())
     CreateLauncher();
 
   // 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.
@@ skipping 274 matching lines @@
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 }  // namespace ash