Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index ebfa9ebcdb5e8f667bb1017806815e6d8f72e58f..a28be5142fcb575b393195ced613032c9ab57f88 100644 |
--- a/ash/shell.cc |
+++ b/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); |
} |