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

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

Issue 10912019: Enable robust decoding of custom wallpaper and allow custom wallpaper on login page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check conflict. Created 8 years, 4 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
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
index 17bdecbade2c06b370e6a8fe02acf05d4506be34..4315435f595bacdfa2fd2d4f5f1ebf398427b71e 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -110,7 +110,8 @@ WallpaperManager* WallpaperManager::Get() {
}
WallpaperManager::WallpaperManager()
- : ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_(new UserImageLoader)),
+ : ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_(
+ new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC))),
current_user_wallpaper_type_(User::UNKNOWN),
ALLOW_THIS_IN_INITIALIZER_LIST(current_user_wallpaper_index_(
ash::GetInvalidWallpaperIndex())),
@@ -509,15 +510,8 @@ void WallpaperManager::SetUserWallpaper(const std::string& email) {
SetUserWallpaperProperties(email, User::DAILY, index,
ShouldPersistDataForUser(email));
} else if (type == User::CUSTOMIZED) {
- // For security reason, use default wallpaper instead of custom wallpaper
- // at login screen. The security issue is tracked in issue 143198. Once it
- // fixed, we should then only use custom wallpaper.
- if (!UserManager::Get()->IsUserLoggedIn()) {
- index = ash::GetDefaultWallpaperIndex();
- } else {
- GetCustomWallpaper(email);
- return;
- }
+ GetCustomWallpaper(email);
+ return;
}
ash::Shell::GetInstance()->desktop_background_controller()->
SetDefaultWallpaper(index, false);
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698