summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/background
diff options
context:
space:
mode:
authorbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 16:32:45 +0000
committerbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 16:32:45 +0000
commit2cda5a03af2b1241494d051ba60aa5b2bb5477c7 (patch)
treebf69c18b013335dab7a13e9a070c5eaa9cfb5a66 /chrome/browser/chromeos/background
parent4eb26dd2ba6bd39be48e07238e714939c7729ced (diff)
downloadchromium_src-2cda5a03af2b1241494d051ba60aa5b2bb5477c7.zip
chromium_src-2cda5a03af2b1241494d051ba60aa5b2bb5477c7.tar.gz
chromium_src-2cda5a03af2b1241494d051ba60aa5b2bb5477c7.tar.bz2
Reland "Implement random wallpaper feature"
CL 10302016 reverted because of failed testes on linux chromeos bot. The reason was a DCHECK fail. I have fixed the fails in CL 10382072. So reland the random wallpaper feature here. TBR=nikita,ben,jhawkins BUG=120217 TEST=Go to set wallpaper overlay in settings page, check the "I'm feeling lucky" checkbox. Sign out and sign in a couple of times, verify if the wallpaper is random. Review URL: https://chromiumcodereview.appspot.com/10384079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/background')
-rw-r--r--chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index ece4f3c..7e19957 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -28,7 +28,7 @@ class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
}
virtual const int GetUserWallpaperIndex() OVERRIDE {
- return chromeos::UserManager::Get()->GetUserWallpaperIndex();
+ return chromeos::UserManager::Get()->GetLoggedInUserWallpaperIndex();
}
virtual void OpenSetWallpaperPage() OVERRIDE {