Reorder the initialization of wallpapers and secondary 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 466 matching lines @@
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(new internal::ShadowController());
   }
 
   if (!delegate_.get() || delegate_->IsUserLoggedIn())
     CreateLauncher();
 
   // Force Layout
   root_window_controller->root_window_layout()->OnWindowResized();
 
+  display_controller_->InitSecondaryDisplays();
+
   // It needs to be created after OnWindowResized has been called, otherwise the
-  // widget will not paint when restoring after a browser crash.
+  // 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();
 
   power_button_controller_.reset(new PowerButtonController);
   AddShellObserver(power_button_controller_.get());
 
-  display_controller_->InitSecondaryDisplays();
-
   if (initially_hide_cursor_)
     cursor_manager_.ShowCursor(false);
 }
 
 void Shell::AddEnvEventFilter(aura::EventFilter* filter) {
   env_filter_->AddFilter(filter);
 }
 
 void Shell::RemoveEnvEventFilter(aura::EventFilter* filter) {
   env_filter_->RemoveFilter(filter);
@@ skipping 253 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