Wallpaper manager backend APIs

chrome/browser/chromeos/login/wallpaper_manager.cc

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 95a3cb5f4a3498fe6ac4e9d9d5c225c94e8de110..263a4dc795016a32ae0808a5b313f814e0b83a76 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 
-#include "ash/desktop_background/desktop_background_resources.h"
+#include "ash/shell.h"
+#include "ash/desktop_background/desktop_background_controller.h"

[flackr, 2012/07/18 13:46:10]

nit: Sort

[bshe, 2012/07/18 18:35:02]

Done.

 #include "base/logging.h"
 #include "base/time.h"
 #include "base/values.h"
@@ -25,7 +26,9 @@ namespace chromeos {
 
 static WallpaperManager* g_wallpaper_manager = NULL;
 
-WallpaperManager::WallpaperManager() : last_selected_user_("") {
+WallpaperManager::WallpaperManager()
+    : ALLOW_THIS_IN_INITIALIZER_LIST(image_loader_(new UserImageLoader)),
+      last_selected_user_("") {
   system::TimezoneSettings::GetInstance()->AddObserver(this);
   RestartTimer();
 }
@@ -60,6 +63,15 @@ void WallpaperManager::RestartTimer() {
   }
 }
 
+void WallpaperManager::SetWallpaperFromFile(std::string email,
+                                            const std::string& path,
+                                            ash::WallpaperLayout layout) {
+  image_loader_->Start(
+      path, 0, false,
+      base::Bind(&WallpaperManager::OnCustomWallpaperLoaded,
+                 base::Unretained(this), email, layout));
+}
+
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
@@ -68,6 +80,14 @@ void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
+void WallpaperManager::OnCustomWallpaperLoaded(const std::string& email,

[Mihai Parparita -not on Chrome, 2012/07/16 23:14:25]

The email parameter appears to be unused (so it can also be removed from
SetWallpaperFromFile).

[bshe, 2012/07/18 18:28:56]

This will be used in the future. I need to have the email address as key to save
wallpaper related information to local state. Could I keep it for now? But I am
fine to remove it if you insist.

On 2012/07/16 23:14:25, Mihai Parparita wrote:

+                                               ash::WallpaperLayout layout,
+                                               const UserImage& user_image) {
+  const SkBitmap& wallpaper = user_image.image();
+  ash::Shell::GetInstance()->desktop_background_controller()->
+      SetCustomWallpaper(wallpaper, layout);
+}
+
 void WallpaperManager::BatchUpdateWallpaper() {
   PrefService* local_state = g_browser_process->local_state();
   UserManager* user_manager = UserManager::Get();