diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 17:12:15 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 17:12:15 +0000 |
| commit | 2384eae998e1fe9d2a95ffd0005e5df2de2bd3b9 (patch) | |
| tree | b0608d1ecdb8217ba251b8e1757578205936bb75 /ash/accelerators | |
| parent | 0e8949526deeb30f20bf3fdaee1e010281f7504b (diff) | |
| download | chromium_src-2384eae998e1fe9d2a95ffd0005e5df2de2bd3b9.zip chromium_src-2384eae998e1fe9d2a95ffd0005e5df2de2bd3b9.tar.gz chromium_src-2384eae998e1fe9d2a95ffd0005e5df2de2bd3b9.tar.bz2 | |
Load user custom wallpaper after browser crash.
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/10459003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 72a43ec..c4f21ba 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -155,10 +155,12 @@ bool HandleToggleDesktopBackgroundMode() { ash::DesktopBackgroundController* desktop_background_controller = ash::Shell::GetInstance()->desktop_background_controller(); if (desktop_background_controller->desktop_background_mode() == - ash::DesktopBackgroundController::BACKGROUND_IMAGE) + ash::DesktopBackgroundController::BACKGROUND_IMAGE) { desktop_background_controller->SetDesktopBackgroundSolidColorMode(); - else - desktop_background_controller->SetLoggedInUserWallpaper(); + } else { + ash::Shell::GetInstance()->user_wallpaper_delegate()-> + SetLoggedInUserWallpaper(); + } return true; } |