Chrome OS: revert the device wallpaper change within a user session.

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 <utility>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
@@ skipping 1023 matching lines @@
                  weak_factory_.GetWeakPtr(), account_id));
 }
 
 void WallpaperManager::OnDeviceWallpaperDecoded(
     const AccountId& account_id,
     std::unique_ptr<user_manager::UserImage> user_image) {
   WallpaperInfo wallpaper_info = {GetDeviceWallpaperFilePath().value(),
                                   wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED,
                                   user_manager::User::DEVICE,
                                   base::Time::Now().LocalMidnight()};
-  if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
-    // In a user's session treat the device wallpaper as a normal custom
-    // wallpaper. It should be persistent and can be overriden by other user
-    // selected wallpapers.
-    SetUserWallpaperInfo(account_id, wallpaper_info, true /* is_persistent */);
-    GetPendingWallpaper(account_id, false)
-        ->ResetSetWallpaperImage(user_image->image(), wallpaper_info);
-    wallpaper_cache_[account_id] = CustomWallpaperElement(
-        GetDeviceWallpaperFilePath(), user_image->image());
-  } else {
-    // In the login screen set the device wallpaper as the wallpaper.
-    GetPendingWallpaper(user_manager::SignInAccountId(), false)
-        ->ResetSetWallpaperImage(user_image->image(), wallpaper_info);
-  }
+  DCHECK(!user_manager::UserManager::Get()->IsUserLoggedIn());
+  // In the login screen set the device wallpaper as the wallpaper.
+  GetPendingWallpaper(user_manager::SignInAccountId(), false)
+      ->ResetSetWallpaperImage(user_image->image(), wallpaper_info);
 }
 
 void WallpaperManager::InitializeRegisteredDeviceWallpaper() {
   if (user_manager::UserManager::Get()->IsUserLoggedIn())
     return;
 
   bool disable_boot_animation =
       GetCommandLine()->HasSwitch(switches::kDisableBootAnimation);
   bool show_users = true;
   bool result = CrosSettings::Get()->GetBoolean(
@@ skipping 75 matching lines @@
     return false;
   }
 
   const base::DictionaryValue* dict = nullptr;
   if (!CrosSettings::Get()->GetDictionary(kDeviceWallpaperImage, &dict) ||
       !dict->GetStringWithoutPathExpansion("url", url) ||
       !dict->GetStringWithoutPathExpansion("hash", hash)) {
     return false;
   }
 
-  // Only set the device wallpaper if 1) we're at the login screen or 2) there
-  // is no user policy wallpaper in a user session and the user has the default
-  // wallpaper or device wallpaper in a user session. Note in the latter case,
-  // the device wallpaper can be overridden by user-selected wallpapers.
-  if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
-    WallpaperInfo info;
-    if (GetUserWallpaperInfo(account_id, &info) &&
-        (info.type == user_manager::User::POLICY ||
-         (info.type != user_manager::User::DEFAULT &&
-          info.type != user_manager::User::DEVICE))) {
-      return false;
-    }
-  }
+  // Only set the device wallpaper if we're at the login screen.
+  if (user_manager::UserManager::Get()->IsUserLoggedIn())
+    return false;
 
   return true;
 }
 
 base::FilePath WallpaperManager::GetDeviceWallpaperDir() {
   base::FilePath wallpaper_dir;
   if (!PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir)) {
     LOG(ERROR) << "Unable to get wallpaper dir.";
     return base::FilePath();
   }
@@ skipping 231 matching lines @@
 
   UMA_HISTOGRAM_ENUMERATION(
       "Ash.Wallpaper.Apps",
       wallpaper_manager_util::ShouldUseAndroidWallpapersApp(profile)
           ? WALLPAPERS_APP_ANDROID
           : WALLPAPERS_PICKER_APP_CHROMEOS,
       WALLPAPERS_APPS_NUM);
 }
 
 }  // namespace chromeos