Hook up custom wallpaper code path to new wallpaper picker.

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 "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 343 matching lines @@
     BatchUpdateWallpaper();
   } else {
     // Set up a one shot timer which will batch update wallpaper at midnight.
     timer_.Start(FROM_HERE,
                  base::TimeDelta::FromSeconds(remaining_seconds),
                  this,
                  &WallpaperManager::BatchUpdateWallpaper);
   }
 }
 
+void WallpaperManager::SetCustomWallpaper(const std::string& username,
+    ash::WallpaperLayout layout,
+    User::WallpaperType type,
+    base::WeakPtr<WallpaperDelegate> delegate,
+    const UserImage& wallpaper) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  std::string wallpaper_path =
+      GetOriginalWallpaperPathForUser(username).value();
+
+  bool is_persistent = ShouldPersistDataForUser(username);
+
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(&WallpaperManager::GenerateUserWallpaperThumbnail,
+                 base::Unretained(this), username, type, delegate,
+                 wallpaper.image()));
+
+  if (is_persistent) {
+    BrowserThread::PostTask(
+        BrowserThread::FILE,
+        FROM_HERE,
+        base::Bind(&WallpaperManager::SaveCustomWallpaper,
+                   base::Unretained(this),
+                   username,
+                   FilePath(wallpaper_path),
+                   layout,
+                   wallpaper));
+  }
+
+  ash::Shell::GetInstance()->desktop_background_controller()->
+      SetCustomWallpaper(wallpaper.image(), layout);
+
+  bool new_wallpaper_ui_disabled = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewWallpaperUI);
+  if (!new_wallpaper_ui_disabled) {
+    // User's custom wallpaper path is determined by username/email and the
+    // appropriate wallpaper resolution in GetCustomWallpaperInternal. So use
+    // DUMMY as file name here.
+    WallpaperInfo info = {
+        "DUMMY",
+        layout,
+        User::CUSTOMIZED,
+        base::Time::Now().LocalMidnight()
+    };
+    SetUserWallpaperInfo(username, info, is_persistent);
+  }
+  SetUserWallpaperProperties(username, type, layout, is_persistent);
+}
+
+void WallpaperManager::SetUserWallpaperFromFile(
+    const std::string& username,
+    const FilePath& path,
+    ash::WallpaperLayout layout,
+    base::WeakPtr<WallpaperDelegate> delegate) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // For wallpapers, save the image without resizing.
+  wallpaper_loader_->Start(
+      path.value(), 0,
+      base::Bind(&WallpaperManager::SetCustomWallpaper,
+                 base::Unretained(this), username, layout, User::CUSTOMIZED,
+                 delegate));
+}
+
 void WallpaperManager::SetUserWallpaperProperties(const std::string& email,
                                                   User::WallpaperType type,
                                                   int index,
                                                   bool is_persistent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   current_user_wallpaper_type_ = type;
   current_user_wallpaper_index_ = index;
   if (!is_persistent)
     return;
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate wallpaper_update(local_state,
       UserManager::kUserWallpapersProperties);
 
   base::DictionaryValue* wallpaper_properties = new base::DictionaryValue();
   wallpaper_properties->Set(kWallpaperTypeNodeName,
                             new base::FundamentalValue(type));
   wallpaper_properties->Set(kWallpaperIndexNodeName,
                             new base::FundamentalValue(index));
   wallpaper_properties->SetString(kWallpaperDateNodeName,
       base::Int64ToString(base::Time::Now().LocalMidnight().ToInternalValue()));
   wallpaper_update->SetWithoutPathExpansion(email, wallpaper_properties);
 }
 
-void WallpaperManager::SetUserWallpaperFromFile(
-    const std::string& username,
-    const FilePath& path,
-    ash::WallpaperLayout layout,
-    base::WeakPtr<WallpaperDelegate> delegate) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // For wallpapers, save the image without resizing.
-  wallpaper_loader_->Start(
-      path.value(), 0,
-      base::Bind(&WallpaperManager::SetCustomWallpaper,
-                 base::Unretained(this), username, layout, User::CUSTOMIZED,
-                 delegate));
-}
-
 void WallpaperManager::SetInitialUserWallpaper(const std::string& username,
                                                bool is_persistent) {
   current_user_wallpaper_type_ = User::DEFAULT;
   if (username == kGuestUser)
     current_user_wallpaper_index_ = ash::GetGuestWallpaperIndex();
   else
     current_user_wallpaper_index_ = ash::GetDefaultWallpaperIndex();
 
   bool new_wallpaper_ui_disabled = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableNewWallpaperUI);
@@ skipping 568 matching lines @@
                  path));
 }
 
 void WallpaperManager::SaveWallpaperInternal(const FilePath& path,
                                              const char* data,
                                              int size) {
   int written_bytes = file_util::WriteFile(path, data, size);
   DCHECK(written_bytes == size);
 }
 
-void WallpaperManager::SetCustomWallpaper(const std::string& username,
-    ash::WallpaperLayout layout,
-    User::WallpaperType type,
-    base::WeakPtr<WallpaperDelegate> delegate,
-    const UserImage& wallpaper) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  std::string wallpaper_path =
-      GetOriginalWallpaperPathForUser(username).value();
-
-  bool is_persistent = ShouldPersistDataForUser(username);
-
-  BrowserThread::PostTask(
-      BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&WallpaperManager::GenerateUserWallpaperThumbnail,
-                 base::Unretained(this), username, type, delegate,
-                 wallpaper.image()));
-
-  if (is_persistent) {
-    BrowserThread::PostTask(
-        BrowserThread::FILE,
-        FROM_HERE,
-        base::Bind(&WallpaperManager::SaveCustomWallpaper,
-                   base::Unretained(this),
-                   username,
-                   FilePath(wallpaper_path),
-                   layout,
-                   wallpaper));
-  }
-
-  ash::Shell::GetInstance()->desktop_background_controller()->
-      SetCustomWallpaper(wallpaper.image(), layout);
-  SetUserWallpaperProperties(username, type, layout, is_persistent);
-}
-
 bool WallpaperManager::ShouldPersistDataForUser(const std::string& email) {
   UserManager* user_manager = UserManager::Get();
   // |email| is from user list in local state. We should persist data in this
   // case.
   if (!user_manager->IsUserLoggedIn())
     return true;
   return !(email == user_manager->GetLoggedInUser().email() &&
            user_manager->IsCurrentUserEphemeral());
 }
 
 void WallpaperManager::OnWallpaperLoaded(ash::WallpaperLayout layout,
                                          const UserImage& user_image) {
   SetWallpaperFromImageSkia(user_image.image(), layout);
 }
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos