Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.

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 a036ca9064fdbf43a1a63d07eba4e94046c9fc0f..fbef3ff4642b85d4dc663af6e605d7aa8fe5ac40 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -7,6 +7,8 @@
 #include <numeric>
 #include <vector>
 
+#include "ash/ash_switches.h"
+#include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ -39,6 +41,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
+#include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ -46,6 +49,8 @@
 
 using content::BrowserThread;
 
+namespace chromeos {
+
 namespace {
 
 // The amount of delay before starts to move custom wallpapers to the new place.
@@ -114,8 +119,6 @@ bool MoveCustomWallpaperDirectory(const char* sub_dir,
 
 }  // namespace
 
-namespace chromeos {
-
 const char kWallpaperSequenceTokenName[] = "wallpaper-sequence";
 
 const char kSmallWallpaperSuffix[] = "_small";
@@ -126,6 +129,13 @@ const char kLargeWallpaperSubDir[] = "large";
 const char kOriginalWallpaperSubDir[] = "original";
 const char kThumbnailWallpaperSubDir[] = "thumb";
 
+const int kSmallWallpaperMaxWidth = 1366;
+const int kSmallWallpaperMaxHeight = 800;
+const int kLargeWallpaperMaxWidth = 2560;
+const int kLargeWallpaperMaxHeight = 1700;
+const int kWallpaperThumbnailWidth = 108;
+const int kWallpaperThumbnailHeight = 68;
+
 static WallpaperManager* g_wallpaper_manager = NULL;
 
 // This object is passed between several threads while wallpaper is being
@@ -146,6 +156,9 @@ class MovableOnDestroyCallback {
   base::Closure callback_;
 };
 
+void WallpaperManager::Observer::OnUpdateWallpaperForTesting() {
+}
+
 WallpaperManager::PendingWallpaper::PendingWallpaper(
     const base::TimeDelta delay,
     const std::string& user_id)
@@ -208,9 +221,9 @@ void WallpaperManager::PendingWallpaper::ProcessRequest() {
   if (default_) {
     manager->DoSetDefaultWallpaper(user_id_, on_finish_.Pass());
   } else if (!user_wallpaper_.isNull()) {
-    ash::Shell::GetInstance()->
-        desktop_background_controller()->
-            SetCustomWallpaper(user_wallpaper_, info_.layout);
+    ash::Shell::GetInstance()
+        ->desktop_background_controller()
+        ->SetWallpaperImage(user_wallpaper_, info_.layout);
   } else if (!wallpaper_path_.empty()) {
     manager->task_runner_->PostTask(
         FROM_HERE,
@@ -306,6 +319,8 @@ WallpaperManager::WallpaperManager()
       should_cache_wallpaper_(false),
       weak_factory_(this),
       pending_inactive_(NULL) {
+  SetDefaultWallpaperPathsFromCommandLine(
+      base::CommandLine::ForCurrentProcess());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
@@ -432,7 +447,7 @@ void WallpaperManager::InitializeWallpaper() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UserManager* user_manager = UserManager::Get();
 
-  CommandLine* command_line = GetComandLine();
+  CommandLine* command_line = GetCommandLine();
   if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
     // Guest wallpaper should be initialized when guest login.
     // Note: This maybe called before login. So IsLoggedInAsGuest can not be
@@ -477,7 +492,7 @@ void WallpaperManager::Observe(int type,
       break;
     }
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
-      if (!GetComandLine()->HasSwitch(switches::kDisableBootAnimation)) {
+      if (!GetCommandLine()->HasSwitch(switches::kDisableBootAnimation)) {
         BrowserThread::PostDelayedTask(
             BrowserThread::UI, FROM_HERE,
             base::Bind(&WallpaperManager::CacheUsersWallpapers,
@@ -520,7 +535,8 @@ bool WallpaperManager::ResizeWallpaper(
     ash::WallpaperLayout layout,
     int preferred_width,
     int preferred_height,
-    scoped_refptr<base::RefCountedBytes>* output) const {
+    scoped_refptr<base::RefCountedBytes>* output,
+    gfx::ImageSkia* output_skia) const {
   DCHECK(BrowserThread::GetBlockingPool()->
       IsRunningSequenceOnCurrentThread(sequence_token_));
   int width = wallpaper.image().width();
@@ -567,27 +583,38 @@ bool WallpaperManager::ResizeWallpaper(
       image.height(),
       image.width() * image.bytesPerPixel(),
       kDefaultEncodingQuality, &(*output)->data());
+
+  if (output_skia) {
+    resized_image.MakeThreadSafe();
+    *output_skia = resized_image;
+  }
+
   return true;
 }
 
-void WallpaperManager::ResizeAndSaveWallpaper(const UserImage& wallpaper,
+bool WallpaperManager::ResizeAndSaveWallpaper(const UserImage& wallpaper,
                                               const base::FilePath& path,
                                               ash::WallpaperLayout layout,
                                               int preferred_width,
-                                              int preferred_height) const {
+                                              int preferred_height,
+                                              gfx::ImageSkia* result) const {
   if (layout == ash::WALLPAPER_LAYOUT_CENTER) {
     // TODO(bshe): Generates cropped custom wallpaper for CENTER layout.
     if (base::PathExists(path))
       base::DeleteFile(path, false);
-    return;
+    return false;
   }
   scoped_refptr<base::RefCountedBytes> data;
-  if (ResizeWallpaper(wallpaper, layout, preferred_width, preferred_height,
-                      &data)) {
-    SaveWallpaperInternal(path,
-                          reinterpret_cast<const char*>(data->front()),
-                          data->size());
+  if (ResizeWallpaper(wallpaper,
+                      layout,
+                      preferred_width,
+                      preferred_height,
+                      &data,
+                      result)) {
+    return SaveWallpaperInternal(
+        path, reinterpret_cast<const char*>(data->front()), data->size());
   }
+  return false;
 }
 
 bool WallpaperManager::IsPolicyControlled(const std::string& user_id) const {
@@ -628,6 +655,18 @@ void WallpaperManager::OnPolicyFetched(const std::string& policy,
                  user_id));
 }
 
+// static
+WallpaperManager::WallpaperResolution
+WallpaperManager::GetAppropriateResolution() {

[bshe, 2014/04/07 15:49:16]

nit: I believe we should have 4 space indent when wrap to a new line. If the
lint tool suggest differently, do you mind to confirm with the linter author to
see if it's a linter bug or expected?

[oshima, 2014/04/07 17:16:11]

I believe this is fine. The recommended way nowadays is to just run git cl
format, and I will simply accept it, even though it may not match surrounding
code (as it eventually will).

+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  gfx::Size size =
+      ash::DesktopBackgroundController::GetMaxDisplaySizeInNative();
+  return (size.width() > kSmallWallpaperMaxWidth ||
+          size.height() > kSmallWallpaperMaxHeight)
+             ? WALLPAPER_RESOLUTION_LARGE
+             : WALLPAPER_RESOLUTION_SMALL;
+}
+
 void WallpaperManager::SetPolicyControlledWallpaper(
     const std::string& user_id,
     const UserImage& wallpaper) {
@@ -742,9 +781,41 @@ void WallpaperManager::DoSetDefaultWallpaper(
   // up the tests.
   if (!ash::Shell::HasInstance())
     return;
-  if (ash::Shell::GetInstance()->desktop_background_controller()->
-          SetDefaultWallpaper(UserManager::Get()->IsLoggedInAsGuest()))
-    loaded_wallpapers_++;
+
+  WallpaperResolution resolution = GetAppropriateResolution();
+  const bool use_small = (resolution == WALLPAPER_RESOLUTION_SMALL);
+
+  const base::FilePath* file = NULL;
+
+  if (UserManager::Get()->IsLoggedInAsGuest()) {
+    file =
+        use_small ? &guest_small_wallpaper_file_ : &guest_large_wallpaper_file_;
+  } else {
+    file = use_small ? &default_small_wallpaper_file_
+                     : &default_large_wallpaper_file_;
+  }
+  DCHECK(file);
+  if (!default_wallpaper_image_.get() ||
+      default_wallpaper_image_->url().spec() != file->value()) {
+    default_wallpaper_image_.reset();
+    if (!file->empty()) {
+      loaded_wallpapers_++;
+      StartLoadAndSetDefaultWallpaper(
+          *file, &default_wallpaper_image_, on_finish.Pass());
+      return;
+    }
+

[bshe, 2014/04/07 15:49:16]

Should we fallback to resource wallpaper in OnDefaultWallpaperDecoded? If the
wallpaper decoding is somehow failed (will return a null imageskia in this
case), we should try to fall back to the resource wallpaper too.

[Alexander Alekseev, 2014/04/08 13:18:49]

This is different to the way it works now (I don't know why). I can
implement it if you are sure we should change behavior here.

[Daniel Erat, 2014/04/08 14:11:16]

i wouldn't recommend spending any more time on the resource fallback path. i
think we should remove it entirely. i'll do it after this change if you don't
want to. :-)

[bshe, 2014/04/08 15:00:39]

I believe the original behavior is to fallback to the resource wallpaper if
failure, not just when the wallpaper flag is not set. When the default wallpaper
(especially we are going to download it from server now) is somehow corrupted, I
think it is slightly better to fallback to a resource wallpaper instead of a
solid black background. But I dont worry it too much as I believe this case
should be really rare and easy to recover. You can keep it as it is.

The resource fallback is going to be used by linux_chromeos and chromium build.
If we remove it, I worry that these builds will have a solid black background.
So we probably want to keep it here?

On 2014/04/08 14:11:16, Daniel Erat wrote:

[Daniel Erat, 2014/04/08 16:27:45]

the resource file is just a solid gray color. the code should dynamically
generate a gfx::Image with the same color if it needs to fall back (but since
this is an unexpected case, it'd also be fine to just use a solid black
background here).

+    const int resource_id = use_small ? IDR_AURA_WALLPAPER_DEFAULT_SMALL
+                                      : IDR_AURA_WALLPAPER_DEFAULT_LARGE;
+
+    loaded_wallpapers_ +=
+        ash::Shell::GetInstance()
+            ->desktop_background_controller()
+            ->SetWallpaperResource(resource_id, ash::WALLPAPER_LAYOUT_TILE);
+    return;
+  }
+  ash::Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(
+      default_wallpaper_image_->image(), ash::WALLPAPER_LAYOUT_STRETCH);

[bshe, 2014/04/07 15:49:16]

I believe for small resolution wallpaper, we should use WALLPAPER_LAYOUT_CENTER
and for large resolution we should use  WALLPAPER_LAYOUT_CENTER_CROPPED.

[Alexander Alekseev, 2014/04/08 13:18:49]

Done.

 }
 
 void WallpaperManager::InitInitialUserWallpaper(const std::string& user_id,
@@ -829,14 +900,7 @@ void WallpaperManager::ScheduleSetUserWallpaper(const std::string& user_id,
         ->ResetSetWallpaperImage(user_wallpaper, info);
   } else {
     if (info.type == User::CUSTOMIZED || info.type == User::POLICY) {
-      ash::WallpaperResolution resolution =
-          ash::Shell::GetInstance()->
-              desktop_background_controller()->
-                  GetAppropriateResolution();
-      const char* sub_dir = (resolution == ash::WALLPAPER_RESOLUTION_SMALL)
-                                ? kSmallWallpaperSubDir
-                                : kLargeWallpaperSubDir;
-
+      const char* sub_dir = GetCustomWallpaperSubdirForCurrentResolution();
       // Wallpaper is not resized when layout is ash::WALLPAPER_LAYOUT_CENTER.
       // Original wallpaper should be used in this case.
       // TODO(bshe): Generates cropped custom wallpaper for CENTER layout.
@@ -888,6 +952,7 @@ void WallpaperManager::SetWallpaperFromImageSkia(
 }
 
 void WallpaperManager::UpdateWallpaper(bool clear_cache) {
+  FOR_EACH_OBSERVER(Observer, observers_, OnUpdateWallpaperForTesting());
   if (clear_cache)
     wallpaper_cache_.clear();
   current_wallpaper_path_.clear();
@@ -953,10 +1018,7 @@ void WallpaperManager::CacheUserWallpaper(const std::string& user_id) {
     base::FilePath wallpaper_dir;
     base::FilePath wallpaper_path;
     if (info.type == User::CUSTOMIZED || info.type == User::POLICY) {
-      ash::WallpaperResolution resolution = ash::Shell::GetInstance()->
-          desktop_background_controller()->GetAppropriateResolution();
-      const char* sub_dir  = (resolution == ash::WALLPAPER_RESOLUTION_SMALL) ?
-            kSmallWallpaperSubDir : kLargeWallpaperSubDir;
+      const char* sub_dir = GetCustomWallpaperSubdirForCurrentResolution();
       base::FilePath wallpaper_path = GetCustomWallpaperDir(sub_dir);
       wallpaper_path = wallpaper_path.Append(info.file);
       task_runner_->PostTask(
@@ -1070,7 +1132,13 @@ void WallpaperManager::EnsureCustomWallpaperDirectories(
     base::CreateDirectory(dir);
 }
 
-CommandLine* WallpaperManager::GetComandLine() {
+void WallpaperManager::set_command_line_for_testing(
+    base::CommandLine* command_line) {
+  command_line_for_testing_ = command_line;
+  SetDefaultWallpaperPathsFromCommandLine(command_line);
+}
+
+CommandLine* WallpaperManager::GetCommandLine() {
   CommandLine* command_line = command_line_for_testing_ ?
       command_line_for_testing_ : CommandLine::ForCurrentProcess();
   return command_line;
@@ -1080,8 +1148,8 @@ void WallpaperManager::InitializeRegisteredDeviceWallpaper() {
   if (UserManager::Get()->IsUserLoggedIn())
     return;
 
-  bool disable_boot_animation = GetComandLine()->
-      HasSwitch(switches::kDisableBootAnimation);
+  bool disable_boot_animation =
+      GetCommandLine()->HasSwitch(switches::kDisableBootAnimation);
   bool show_users = true;
   bool result = CrosSettings::Get()->GetBoolean(
       kAccountsPrefShowUserNamesOnSignIn, &show_users);
@@ -1110,12 +1178,11 @@ void WallpaperManager::LoadWallpaper(const std::string& user_id,
   base::FilePath wallpaper_path;
   if (info.type == User::ONLINE) {
     std::string file_name = GURL(info.file).ExtractFileName();
-    ash::WallpaperResolution resolution = ash::Shell::GetInstance()->
-        desktop_background_controller()->GetAppropriateResolution();
+    WallpaperResolution resolution = GetAppropriateResolution();
     // Only solid color wallpapers have stretch layout and they have only one
     // resolution.
     if (info.layout != ash::WALLPAPER_LAYOUT_STRETCH &&
-        resolution == ash::WALLPAPER_RESOLUTION_SMALL) {
+        resolution == WALLPAPER_RESOLUTION_SMALL) {
       file_name = base::FilePath(file_name).InsertBeforeExtension(
           kSmallWallpaperSuffix).value();
     }
@@ -1321,8 +1388,9 @@ void WallpaperManager::OnWallpaperDecoded(
   }
 
   if (update_wallpaper) {
-    ash::Shell::GetInstance()->desktop_background_controller()->
-        SetCustomWallpaper(wallpaper.image(), layout);
+    ash::Shell::GetInstance()
+        ->desktop_background_controller()
+        ->SetWallpaperImage(wallpaper.image(), layout);
   }
 }
 
@@ -1357,19 +1425,27 @@ void WallpaperManager::SaveCustomWallpaper(const std::string& user_id_hash,
   // Re-encode orginal file to jpeg format and saves the result in case that
   // resized wallpaper is not generated (i.e. chrome shutdown before resized
   // wallpaper is saved).
-  ResizeAndSaveWallpaper(wallpaper, original_path,
+  ResizeAndSaveWallpaper(wallpaper,
+                         original_path,
                          ash::WALLPAPER_LAYOUT_STRETCH,
                          wallpaper.image().width(),
-                         wallpaper.image().height());
+                         wallpaper.image().height(),
+                         NULL);
   DeleteAllExcept(original_path);
 
-  ResizeAndSaveWallpaper(wallpaper, small_wallpaper_path, layout,
-                         ash::kSmallWallpaperMaxWidth,
-                         ash::kSmallWallpaperMaxHeight);
+  ResizeAndSaveWallpaper(wallpaper,
+                         small_wallpaper_path,
+                         layout,
+                         kSmallWallpaperMaxWidth,
+                         kSmallWallpaperMaxHeight,
+                         NULL);
   DeleteAllExcept(small_wallpaper_path);
-  ResizeAndSaveWallpaper(wallpaper, large_wallpaper_path, layout,
-                         ash::kLargeWallpaperMaxWidth,
-                         ash::kLargeWallpaperMaxHeight);
+  ResizeAndSaveWallpaper(wallpaper,
+                         large_wallpaper_path,
+                         layout,
+                         kLargeWallpaperMaxWidth,
+                         kLargeWallpaperMaxHeight,
+                         NULL);
   DeleteAllExcept(large_wallpaper_path);
 }
 
@@ -1378,11 +1454,11 @@ void WallpaperManager::RecordUma(User::WallpaperType type, int index) const {
                             User::WALLPAPER_TYPE_COUNT);
 }
 
-void WallpaperManager::SaveWallpaperInternal(const base::FilePath& path,
+bool WallpaperManager::SaveWallpaperInternal(const base::FilePath& path,
                                              const char* data,
                                              int size) const {
   int written_bytes = base::WriteFile(path, data, size);
-  DCHECK(written_bytes == size);
+  return written_bytes == size;
 }
 
 void WallpaperManager::StartLoad(const std::string& user_id,
@@ -1455,4 +1531,48 @@ WallpaperManager::PendingWallpaper* WallpaperManager::GetPendingWallpaper(
   return pending_inactive_;
 }
 
+void WallpaperManager::SetDefaultWallpaperPathsFromCommandLine(
+    base::CommandLine* command_line) {
+  default_small_wallpaper_file_ = command_line->GetSwitchValuePath(
+      ash::switches::kAshDefaultWallpaperSmall);
+  default_large_wallpaper_file_ = command_line->GetSwitchValuePath(
+      ash::switches::kAshDefaultWallpaperLarge);
+  guest_small_wallpaper_file_ =
+      command_line->GetSwitchValuePath(ash::switches::kAshGuestWallpaperSmall);
+  guest_large_wallpaper_file_ =
+      command_line->GetSwitchValuePath(ash::switches::kAshGuestWallpaperLarge);
+  default_wallpaper_image_.reset();
+}
+
+void WallpaperManager::OnDefaultWallpaperDecoded(
+    const base::FilePath& path,
+    scoped_ptr<chromeos::UserImage>* result,
+    MovableOnDestroyCallbackHolder on_finish,
+    const UserImage& wallpaper) {
+  result->reset(new UserImage(wallpaper.image()));
+  (*result)->set_url(GURL(path.value()));
+  ash::Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(
+      wallpaper.image(), ash::WALLPAPER_LAYOUT_STRETCH);
+}
+
+void WallpaperManager::StartLoadAndSetDefaultWallpaper(
+    const base::FilePath& path,
+    scoped_ptr<chromeos::UserImage>* result,
+    MovableOnDestroyCallbackHolder on_finish) {
+  wallpaper_loader_->Start(
+      path.value(),
+      0,  // Do not crop.
+      base::Bind(&WallpaperManager::OnDefaultWallpaperDecoded,
+                 weak_factory_.GetWeakPtr(),
+                 path,
+                 base::Unretained(result),
+                 base::Passed(on_finish.Pass())));
+}
+
+const char* WallpaperManager::GetCustomWallpaperSubdirForCurrentResolution() {
+  WallpaperResolution resolution = GetAppropriateResolution();
+  return (resolution == WALLPAPER_RESOLUTION_SMALL) ? kSmallWallpaperSubDir

[Daniel Erat, 2014/04/07 13:57:00]

nit: remove parentheses around return value

[Alexander Alekseev, 2014/04/08 13:18:49]

Done.

+                                                    : kLargeWallpaperSubDir;
+}
+
 }  // namespace chromeos