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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 10459003: Load user custom wallpaper after browser crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix aura_shell_unittests Created 8 years, 6 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/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index a5df44fcb9ef512bcd6d00c1f44e42ad34c7b7fd..846790c4494d6121a3f6abf2e0addb14b5be54ce 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -358,6 +358,17 @@ void UserManagerImpl::StubUserLoggedIn() {
kStubDefaultImageIndex);
}
+void UserManagerImpl::SetLoggedInUserWallpaper() {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ if (!IsUserLoggedIn() || IsLoggedInAsStub()) {
+ ash::Shell::GetInstance()->desktop_background_controller()->
+ SetDefaultWallpaper(ash::GetInvalidWallpaperIndex());
+ return;
+ }
+ UserSelected(GetLoggedInUser().email());
+}
+
void UserManagerImpl::UserSelected(const std::string& email) {
if (IsKnownUser(email)) {
User::WallpaperType type;
@@ -957,13 +968,6 @@ void UserManagerImpl::MigrateWallpaperData() {
}
}
-int UserManagerImpl::GetLoggedInUserWallpaperIndex() {
- User::WallpaperType type;
- int index;
- GetLoggedInUserWallpaperProperties(&type, &index);
- return index;
-}
-
void UserManagerImpl::GetLoggedInUserWallpaperProperties(
User::WallpaperType* type,
int* index) {

Powered by Google App Engine
This is Rietveld 408576698