diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 23:46:49 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 23:46:49 +0000 |
| commit | 5f2391ea4843068d7d02274774c6ba1c986acd04 (patch) | |
| tree | 8a0789b633bfd3286c08bd8a843ff94ea0eb4cc6 /ash | |
| parent | b34bacaadfd11f42eebee8e83e623f4169747885 (diff) | |
| download | chromium_src-5f2391ea4843068d7d02274774c6ba1c986acd04.zip chromium_src-5f2391ea4843068d7d02274774c6ba1c986acd04.tar.gz chromium_src-5f2391ea4843068d7d02274774c6ba1c986acd04.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index ebfa9eb..a28be51 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); } |