Switch primary display

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index ed0d8fa62449d6a9725872ca044110ba3167502b..d6ee8482b5f017f217acf25876079bbf840afa06 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -195,8 +195,6 @@ Shell::Shell(ShellDelegate* delegate)
   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)
 }
 
@@ -450,6 +448,16 @@ void Shell::Init() {
 
   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());
@@ -466,13 +474,6 @@ void Shell::Init() {
   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)) {
@@ -480,9 +481,6 @@ void Shell::Init() {
     shadow_controller_.reset(new internal::ShadowController());
   }
 
-  // Launcher must be created after secondary displays are initialized.
-  display_controller_->InitSecondaryDisplays();
-
   if (!delegate_.get() || delegate_->IsUserLoggedIn())
     CreateLauncher();