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

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

Issue 11308068: Remove the old wallpaper picker code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 8 years, 1 month 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 e6ad13d55ff28030d8ebbef3063bc11057fb4bdf..d62901adc8f9dda1c6ea494fb5c9fe97d7d673e5 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -406,25 +406,6 @@ std::string UserManagerImpl::GetUserDisplayEmail(
return user ? user->display_email() : username;
}
-void UserManagerImpl::SetLoggedInUserCustomWallpaperLayout(
- ash::WallpaperLayout layout) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
- // TODO(bshe): We current disabled the customized wallpaper feature for
- // Ephemeral user. As we dont want to keep a copy of customized wallpaper in
- // memory. Need a smarter way to solve this.
- if (IsCurrentUserEphemeral())
- return;
- std::string username = logged_in_user_->email();
- DCHECK(!username.empty());
-
- std::string file_path = WallpaperManager::Get()->
- GetWallpaperPathForUser(username, false).value();
- SaveWallpaperToLocalState(username, file_path, layout, User::CUSTOMIZED);
- // Load wallpaper from file.
- WallpaperManager::Get()->SetUserWallpaper(username);
-}
-
void UserManagerImpl::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
@@ -604,7 +585,6 @@ void UserManagerImpl::EnsureUsersLoaded() {
}
user_image_manager_->LoadUserImages(users_);
- WallpaperManager::Get()->MigrateWallpaperData(users_);
}
void UserManagerImpl::RetrieveTrustedDevicePolicies() {
@@ -678,24 +658,6 @@ void UserManagerImpl::NotifyOnLogin() {
DeviceSettingsService::Get()->SetUsername(logged_in_user_->email());
}
-void UserManagerImpl::SaveLoggedInUserWallpaperProperties(
- User::WallpaperType type, int index) {
- // Ephemeral users can not save data to local state.
- // We just cache the index in memory for them.
- bool is_persistent = !IsCurrentUserEphemeral();
- WallpaperManager::Get()->SetUserWallpaperProperties(
- logged_in_user_->email(), type, index, is_persistent);
-}
-
-void UserManagerImpl::SaveWallpaperToLocalState(const std::string& username,
- const std::string& wallpaper_path,
- ash::WallpaperLayout layout,
- User::WallpaperType type) {
- // TODO(bshe): We probably need to save wallpaper_path instead of index.
- WallpaperManager::Get()->SetUserWallpaperProperties(
- username, type, layout, true);
-}
-
void UserManagerImpl::UpdateOwnership(
DeviceSettingsService::OwnershipStatus status,
bool is_owner) {
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.h ('k') | chrome/browser/chromeos/login/wallpaper_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698