Remove wallpaper thumbnail related c++ code. Thumbnail is now generated by javascript.

chrome/browser/chromeos/login/wallpaper_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
 // Names of nodes with info about wallpaper in |kUserWallpapersProperties|
 // dictionary.
 const char kNewWallpaperDateNodeName[] = "date";
 const char kNewWallpaperLayoutNodeName[] = "layout";
 const char kNewWallpaperFileNodeName[] = "file";
 const char kNewWallpaperTypeNodeName[] = "type";
 
 // File path suffix of the original custom wallpaper.
 const char kOriginalCustomWallpaperSuffix[] = "_wallpaper";
 
-gfx::ImageSkia GetWallpaperThumbnail(const gfx::ImageSkia& wallpaper) {
-  gfx::ImageSkia thumbnail = gfx::ImageSkiaOperations::CreateResizedImage(
-      wallpaper,
-      skia::ImageOperations::RESIZE_LANCZOS3,
-      gfx::Size(kThumbnailWidth, kThumbnailHeight));
-
-  thumbnail.MakeThreadSafe();
-  return thumbnail;
-}
-
 // For our scaling ratios we need to round positive numbers.
 int RoundPositive(double x) {
   return static_cast<int>(floor(x + 0.5));
 }
 
 }  // namespace
 
 namespace chromeos {
 
 const char kWallpaperSequenceTokenName[] = "wallpaper-sequence";
@@ skipping 94 matching lines @@
       kSmallWallpaperSuffix : kLargeWallpaperSuffix;
 
   std::string filename = base::StringPrintf("%s_wallpaper%s",
                                             username.c_str(),
                                             suffix);
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   return user_data_dir.AppendASCII(filename);
 }
 
-gfx::ImageSkia WallpaperManager::GetCustomWallpaperThumbnail(
-    const std::string& email) {
-  CustomWallpaperMap::const_iterator it =
-      custom_wallpaper_thumbnail_cache_.find(email);
-  if (it != custom_wallpaper_thumbnail_cache_.end())
-    return (*it).second;
-  else
-    return gfx::ImageSkia();
-}
-
 bool WallpaperManager::GetLoggedInUserWallpaperInfo(WallpaperInfo* info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (UserManager::Get()->IsLoggedInAsStub()) {
     info->file = current_user_wallpaper_info_.file = "";
     info->layout = current_user_wallpaper_info_.layout =
         ash::WALLPAPER_LAYOUT_CENTER_CROPPED;
     info->type = current_user_wallpaper_info_.type = User::DEFAULT;
     return true;
   }
@@ skipping 410 matching lines @@
       task_runner_->PostTask(FROM_HERE,
           base::Bind(&WallpaperManager::GetCustomWallpaperInternal,
                      base::Unretained(this), email, info, wallpaper_path,
                      false /* do not update wallpaper */));
       return;
     }
     LoadWallpaper(email, info, false /* do not update wallpaper */);
   }
 }
 
-void WallpaperManager::CacheThumbnail(const std::string& email,
-                                      scoped_ptr<gfx::ImageSkia> wallpaper) {
-  DCHECK(BrowserThread::GetBlockingPool()->
-      IsRunningSequenceOnCurrentThread(sequence_token_));
-  custom_wallpaper_thumbnail_cache_[email] =
-      GetWallpaperThumbnail(*wallpaper.get());
-}
-
 void WallpaperManager::ClearObsoleteWallpaperPrefs() {
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate wallpaper_properties_pref(prefs,
       kUserWallpapersProperties);
   wallpaper_properties_pref->Clear();
   DictionaryPrefUpdate wallpapers_pref(prefs, kUserWallpapers);
   wallpapers_pref->Clear();
 }
 
 void WallpaperManager::DeleteWallpaperInList(
@@ skipping 109 matching lines @@
                                          &date_string) &&
           base::StringToInt64(date_string, &val)))
       val = 0;
     info->date = base::Time::FromInternalValue(val);
     return true;
   }
 
   return false;
 }
 
-void WallpaperManager::GenerateUserWallpaperThumbnail(
-    const std::string& email,
-    User::WallpaperType type,
-    const gfx::ImageSkia& wallpaper) {
-  DCHECK(BrowserThread::GetBlockingPool()->
-      IsRunningSequenceOnCurrentThread(sequence_token_));
-  custom_wallpaper_thumbnail_cache_[email] = GetWallpaperThumbnail(wallpaper);
-}
-
 void WallpaperManager::GetCustomWallpaperInternal(
     const std::string& email,
     const WallpaperInfo& info,
     const FilePath& wallpaper_path,
     bool update_wallpaper) {
   DCHECK(BrowserThread::GetBlockingPool()->
       IsRunningSequenceOnCurrentThread(sequence_token_));
   std::string file_name = wallpaper_path.BaseName().value();
 
   if (!file_util::PathExists(wallpaper_path)) {
@@ skipping 36 matching lines @@
                            ash::WALLPAPER_LAYOUT_CENTER_CROPPED,
                            User::DEFAULT,
                            base::Time::Now().LocalMidnight()
                          };
     SetUserWallpaperInfo(email, info, true);
 
     if (update_wallpaper)
       SetDefaultWallpaper();
     return;
   }
-  // Generate all reps before passing to another thread.
-  wallpaper.image().EnsureRepsForSupportedScaleFactors();
-  scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.image().DeepCopy());
-
-  task_runner_->PostTask(FROM_HERE,
-                         base::Bind(&WallpaperManager::CacheThumbnail,
-                                    base::Unretained(this), email,
-                                    base::Passed(&deep_copy)));
 
   // Only cache user wallpaper at login screen.
   if (!UserManager::Get()->IsUserLoggedIn()) {
     wallpaper_cache_.insert(std::make_pair(email, wallpaper.image()));
   }
   if (update_wallpaper) {
     ash::Shell::GetInstance()->desktop_background_controller()->
         SetCustomWallpaper(wallpaper.image(), layout);
   }
 }
 
 void WallpaperManager::ProcessCustomWallpaper(
     const std::string& email,
     bool persistent,
     const WallpaperInfo& info,
     scoped_ptr<gfx::ImageSkia> image,
     const UserImage::RawImage& raw_image) {
   DCHECK(BrowserThread::GetBlockingPool()->
       IsRunningSequenceOnCurrentThread(sequence_token_));
   UserImage wallpaper(*image.get(), raw_image);
-  GenerateUserWallpaperThumbnail(email, info.type, wallpaper.image());
   if (persistent)
     SaveCustomWallpaper(email, FilePath(info.file), info.layout, wallpaper);
 }
 
 void WallpaperManager::SaveCustomWallpaper(const std::string& email,
                                            const FilePath& path,
                                            ash::WallpaperLayout layout,
                                            const UserImage& wallpaper) {
   FilePath small_wallpaper_path = GetWallpaperPathForUser(email, true);
   // Delete previous saved wallpapers.
@@ skipping 73 matching lines @@
                           FROM_HERE,
                           base::Bind(&WallpaperManager::StartLoad,
                                      base::Unretained(this),
                                      email,
                                      info,
                                      update_wallpaper,
                                      valid_path));
 }
 
 }  // chromeos