diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:11:04 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:11:04 +0000 |
| commit | d50034734c2dcb1e936db2ecfd8963457595a062 (patch) | |
| tree | 17e7a09c75ab995016a4fc23bc0e7406fe19a8fd /ash/shell.cc | |
| parent | 44247ad326cdb0e3a2f74d1eb7a305aa3c68e062 (diff) | |
| download | chromium_src-d50034734c2dcb1e936db2ecfd8963457595a062.zip chromium_src-d50034734c2dcb1e936db2ecfd8963457595a062.tar.gz chromium_src-d50034734c2dcb1e936db2ecfd8963457595a062.tar.bz2 | |
Reland "Load user custom wallpaper after browser crash"
Reland issue 10459003. It got reverted because of aura shell unittests failing.
TBR=nkostylev@chromium.org, sky@chromium.org, jhawkins@chromium.org
BUG=129810
TEST=
1. Login
2. Set custom wallpaper for desktop background
3. Trigger a chrome crash (about://inducebrowsercrashforrealz)
4. Observe the desktop wallpaper
5. Go to "Set wallpaper" settings dialog and look for the custom added wallpaper thumbnail
Verify that custom wallpaper restored after chrome crash.
Review URL: https://chromiumcodereview.appspot.com/10518003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index fc26843..fcbb11a 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -244,8 +244,9 @@ class DummyUserWallpaperDelegate : public UserWallpaperDelegate { virtual ~DummyUserWallpaperDelegate() {} - virtual const int GetUserWallpaperIndex() OVERRIDE { - return -1; + virtual void SetLoggedInUserWallpaper() OVERRIDE { + ash::Shell::GetInstance()->desktop_background_controller()-> + CreateEmptyWallpaper(); } virtual void OpenSetWallpaperPage() OVERRIDE { @@ -809,7 +810,7 @@ void Shell::Init() { // It needs to be created after OnWindowResized has been called, otherwise the // widget will not paint when restoring after a browser crash. - desktop_background_controller_->SetLoggedInUserWallpaper(); + user_wallpaper_delegate_->SetLoggedInUserWallpaper(); window_modality_controller_.reset(new internal::WindowModalityController); AddRootWindowEventFilter(window_modality_controller_.get()); |