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

Unified Diff: chrome/browser/chromeos/background/desktop_background_observer.cc

Issue 9839098: Fix wallpaper change to a random one when user first click "set wallpaper". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_chromeos crash Created 8 years, 9 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
Index: chrome/browser/chromeos/background/desktop_background_observer.cc
diff --git a/chrome/browser/chromeos/background/desktop_background_observer.cc b/chrome/browser/chromeos/background/desktop_background_observer.cc
index bb0372182f110aecd3a6be62dcbd95955e9cc94c..49f7eff5190c9d32dd5473b8babd2e5e26b1ef51 100644
--- a/chrome/browser/chromeos/background/desktop_background_observer.cc
+++ b/chrome/browser/chromeos/background/desktop_background_observer.cc
@@ -28,17 +28,7 @@ class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
}
virtual const int GetUserWallpaperIndex() OVERRIDE {
- chromeos::UserManager* user_manager = chromeos::UserManager::Get();
- // If at login screen or logged in as a guest/incognito user, then use the
- // default wallpaper.
- if (user_manager->IsLoggedInAsGuest() || !user_manager->IsUserLoggedIn())
- return ash::GetGuestWallpaperIndex();
-
- const chromeos::User& user = user_manager->GetLoggedInUser();
- DCHECK(!user.email().empty());
- int index = user_manager->GetUserWallpaper(user.email());
- DCHECK(index >=0 && index < ash::GetWallpaperCount());
- return index;
+ return chromeos::UserManager::Get()->GetUserWallpaperIndex();
}
virtual void OpenSetWallpaperPage() OVERRIDE {
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | chrome/browser/chromeos/login/user_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698