Speed up custom wallpaper switching time and wallpaper manager code refactor

chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.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/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 67 matching lines @@
 void SetWallpaperOptionsHandler::SetCustomWallpaperThumbnail() {
   web_ui()->CallJavascriptFunction("SetWallpaperOptions.setCustomImage");
 }
 
 void SetWallpaperOptionsHandler::FileSelected(const FilePath& path,
                                               int index,
                                               void* params) {
   UserManager* user_manager = UserManager::Get();
 
   // Default wallpaper layout is CENTER_CROPPED.
-  user_manager->SaveUserWallpaperFromFile(
+  WallpaperManager::Get()->SetUserWallpaperFromFile(
       user_manager->GetLoggedInUser().email(), path, ash::CENTER_CROPPED,
       weak_factory_.GetWeakPtr());
   web_ui()->CallJavascriptFunction("SetWallpaperOptions.didSelectFile");
 }
 
 void SetWallpaperOptionsHandler::SendDefaultImages() {
   ListValue images;
   DictionaryValue* image_detail;
   ash::WallpaperInfo image_info;
 
@@ skipping 39 matching lines @@
   DCHECK(args && args->empty());
 
   SendDefaultImages();
 }
 
 void SetWallpaperOptionsHandler::HandlePageShown(const base::ListValue* args) {
   DCHECK(args && args->empty());
   User::WallpaperType type;
   int index;
   base::Time date;
-  UserManager::Get()->GetLoggedInUserWallpaperProperties(&type, &index, &date);
+  WallpaperManager::Get()->GetLoggedInUserWallpaperProperties(&type, &index,

[Ivan Korotkov, 2012/07/31 21:18:16]

Maybe move all arguments to the next line?

[bshe, 2012/08/01 15:07:35]

Done.

+                                                              &date);
   if (type == User::DAILY && date != base::Time::Now().LocalMidnight()) {
       index = ash::GetNextWallpaperIndex(index);
       UserManager::Get()->SaveLoggedInUserWallpaperProperties(User::DAILY,
                                                               index);
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           InitializeWallpaper();
   }
   base::StringValue image_url(GetDefaultWallpaperThumbnailURL(index));
   base::FundamentalValue is_daily(type == User::DAILY);
   if (type == User::CUSTOMIZED) {
@@ skipping 53 matching lines @@
     UserManager::Get()->SaveLoggedInUserWallpaperProperties(User::DEFAULT,
                                                             user_image_index);
     ash::Shell::GetInstance()->user_wallpaper_delegate()->InitializeWallpaper();
   }
 }
 
 void SetWallpaperOptionsHandler::HandleDailyWallpaper(const ListValue* args) {
   User::WallpaperType type;
   int index;
   base::Time date;
-  UserManager::Get()->GetLoggedInUserWallpaperProperties(&type, &index, &date);
+  WallpaperManager::Get()->GetLoggedInUserWallpaperProperties(&type, &index,
+                                                              &date);

[Ivan Korotkov, 2012/07/31 21:18:16]

Ditto

[bshe, 2012/08/01 15:07:35]

Done.

   if (date != base::Time::Now().LocalMidnight())
     index = ash::GetNextWallpaperIndex(index);
   UserManager::Get()->SaveLoggedInUserWallpaperProperties(User::DAILY, index);
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetDefaultWallpaper(index);
   base::StringValue image_url(GetDefaultWallpaperThumbnailURL(index));
   base::FundamentalValue is_daily(true);
   web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage",
                                    image_url, is_daily);
 }
 
 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
   return browser->window()->GetNativeWindow();
 }
 
 }  // namespace options2
 }  // namespace chromeos