Reorder the initialization of wallpapers and secondary display.

The secondary display has to be initialized before the wallpaper is
initialized.  Otherwise the wallpaper may be rendered in an incorrect way.

BUG=148425


Review URL: https://chromiumcodereview.appspot.com/10918201

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156421 0039d316-1c4b-4281-b951-d872f2087c98

ash/shell.cc

@@ -484,15 +484,17 @@ void Shell::Init() {
   // 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);
 }