Use default wallpaper when user wallpaper info points to empty file path.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

 // Copyright 2014 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/users/wallpaper/wallpaper_manager.h"
 
 #include <numeric>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 1037 matching lines @@
     InitInitialUserWallpaper(user_id, true);
     GetUserWallpaperInfo(user_id, &info);
   }
 
   gfx::ImageSkia user_wallpaper;
   current_user_wallpaper_info_ = info;
   if (GetWallpaperFromCache(user_id, &user_wallpaper)) {
     GetPendingWallpaper(user_id, delayed)
         ->ResetSetWallpaperImage(user_wallpaper, info);
   } else {
+    if (info.file.empty()) {
+      // Uses default built-in wallpaper when file is empty. Eventually, we
+      // will only ship one built-in wallpaper in ChromeOS image.
+      GetPendingWallpaper(user_id, delayed)->ResetSetDefaultWallpaper();
+      return;
+    }
+
     if (info.type == User::CUSTOMIZED || info.type == User::POLICY) {
       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.
       if (info.layout == ash::WALLPAPER_LAYOUT_CENTER)
         sub_dir = kOriginalWallpaperSubDir;
       base::FilePath wallpaper_path = GetCustomWallpaperDir(sub_dir);
       wallpaper_path = wallpaper_path.Append(info.file);
       if (current_wallpaper_path_ == wallpaper_path)
         return;
       current_wallpaper_path_ = wallpaper_path;
       loaded_wallpapers_++;
 
       GetPendingWallpaper(user_id, delayed)
           ->ResetSetCustomWallpaper(info, wallpaper_path);
       return;
     }
 
-    if (info.file.empty()) {
-      // Uses default built-in wallpaper when file is empty. Eventually, we
-      // will only ship one built-in wallpaper in ChromeOS image.
-      GetPendingWallpaper(user_id, delayed)->ResetSetDefaultWallpaper();
-      return;
-    }
-
     // Load downloaded ONLINE or converted DEFAULT wallpapers.
     GetPendingWallpaper(user_id, delayed)->ResetLoadWallpaper(info);
   }
 }
 
 void WallpaperManager::SetWallpaperFromImageSkia(const std::string& user_id,
                                                  const gfx::ImageSkia& image,
                                                  ash::WallpaperLayout layout,
                                                  bool update_wallpaper) {
   DCHECK(UserManager::Get()->IsUserLoggedIn());
@@ skipping 68 matching lines @@
       CacheUserWallpaper(user_id);
     }
   }
 }
 
 void WallpaperManager::CacheUserWallpaper(const std::string& user_id) {
   if (wallpaper_cache_.find(user_id) != wallpaper_cache_.end())
     return;
   WallpaperInfo info;
   if (GetUserWallpaperInfo(user_id, &info)) {
+    if (info.file.empty())
+      return;
+
     base::FilePath wallpaper_dir;
     base::FilePath wallpaper_path;
     if (info.type == User::CUSTOMIZED || info.type == User::POLICY) {
       const char* sub_dir = GetCustomWallpaperSubdirForCurrentResolution();
       base::FilePath wallpaper_path = GetCustomWallpaperDir(sub_dir);
       wallpaper_path = wallpaper_path.Append(info.file);
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&WallpaperManager::GetCustomWallpaperInternal,
                      base::Unretained(this),
@@ skipping 721 matching lines @@
   loaded_wallpapers_++;
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1, 0);
   bitmap.allocPixels();
   bitmap.eraseColor(kDefaultWallpaperColor);
   const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   default_wallpaper_image_.reset(new UserImage(image));
 }
 
 }  // namespace chromeos