Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2285)

Unified Diff: ash/shell.cc

Issue 10918201: Reorder the initialization of wallpapers and secondary display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698