| 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 dafb1b0fab51a15a9053a6d201c7d117e8364f66..2aa195eb50be32173a57801740718f52de395bf2 100644
|
| --- a/chrome/browser/chromeos/login/wallpaper_manager.cc
|
| +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
|
| @@ -96,7 +96,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())),
|
| @@ -465,15 +466,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 {
|
| - FetchCustomWallpaper(email);
|
| - return;
|
| - }
|
| + FetchCustomWallpaper(email);
|
| + return;
|
| }
|
| ash::Shell::GetInstance()->desktop_background_controller()->
|
| SetDefaultWallpaper(index, false);
|
|
|