Invalidate all wallpaper cache if display configuration changed

chrome/browser/chromeos/login/wallpaper_manager.cc

 // Copyright (c) 2013 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 <numeric>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 271 matching lines @@
     const std::string& user_id, gfx::ImageSkia* image) {
   return wallpaper_manager_->GetWallpaperFromCache(user_id, image);
 }
 
 void WallpaperManager::TestApi::SetWallpaperCache(const std::string& user_id,
                                                   const gfx::ImageSkia& image) {
   DCHECK(!image.isNull());
   wallpaper_manager_->wallpaper_cache_[user_id] = image;
 }
 
-void WallpaperManager::TestApi::ClearWallpaperCache() {
-  wallpaper_manager_->ClearWallpaperCache();
+void WallpaperManager::TestApi::ClearDisposableWallpaperCache() {
+  wallpaper_manager_->ClearDisposableWallpaperCache();
 }
 
 // static
 WallpaperManager* WallpaperManager::Get() {
   if (!g_wallpaper_manager)
     g_wallpaper_manager = new WallpaperManager();
   return g_wallpaper_manager;
 }
 
 WallpaperManager::WallpaperManager()
@@ skipping 59 matching lines @@
   WallpaperInfo info;
   if (GetLoggedInUserWallpaperInfo(&info)) {
     // TODO(sschmitz): We need an index for default wallpapers for the new UI.
     RecordUma(info.type, -1);
     if (info == current_user_wallpaper_info_)
       return;
   }
   SetUserWallpaperNow(UserManager::Get()->GetLoggedInUser()->email());
 }
 
-void WallpaperManager::ClearWallpaperCache() {
+void WallpaperManager::ClearDisposableWallpaperCache() {
   // Cancel callback for previous cache requests.
   weak_factory_.InvalidateWeakPtrs();
   if (!UserManager::IsMultipleProfilesAllowed()) {
     wallpaper_cache_.clear();
   } else {
     // Keep the wallpaper of logged in users in cache at multi-profile mode.
     std::set<std::string> logged_in_users_names;
     const UserList& logged_users = UserManager::Get()->GetLoggedInUsers();
     for (UserList::const_iterator it = logged_users.begin();
          it != logged_users.end();
@@ skipping 76 matching lines @@
   }
   SetUserWallpaperDelayed(user_manager->GetLoggedInUser()->email());
 }
 
 void WallpaperManager::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
-      ClearWallpaperCache();
+      ClearDisposableWallpaperCache();
       BrowserThread::PostDelayedTask(
           BrowserThread::UI,
           FROM_HERE,
           base::Bind(&WallpaperManager::MoveLoggedInUserCustomWallpaper,
                      weak_factory_.GetWeakPtr()),
           base::TimeDelta::FromSeconds(kMoveCustomWallpaperDelaySeconds));
       break;
     }
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
       if (!GetComandLine()->HasSwitch(switches::kDisableBootAnimation)) {
@@ skipping 340 matching lines @@
   info.layout = layout;
   if (UserManager::IsMultipleProfilesAllowed())
     wallpaper_cache_[user_id] = wallpaper;
 
   if (update_wallpaper) {
     GetPendingWallpaper(last_selected_user_, false /* Not delayed */)
         ->ResetSetWallpaperImage(wallpaper, info);
   }
 }
 
-void WallpaperManager::UpdateWallpaper() {
-  ClearWallpaperCache();
+void WallpaperManager::UpdateWallpaper(bool clear_cache) {
+  if (clear_cache)
+    wallpaper_cache_.clear();
   current_wallpaper_path_.clear();
   // For GAIA login flow, the last_selected_user_ may not be set before user
   // login. If UpdateWallpaper is called at GAIA login screen, no wallpaper will
   // be set. It could result a black screen on external monitors.
   // See http://crbug.com/265689 for detail.
   if (last_selected_user_.empty()) {
     SetDefaultWallpaperNow(UserManager::kSignInUser);
     return;
   }
   SetUserWallpaperNow(last_selected_user_);
@@ skipping 546 matching lines @@
     loading_.push_back(new WallpaperManager::PendingWallpaper(
         (delayed ? GetWallpaperLoadDelay()
                  : base::TimeDelta::FromMilliseconds(0)),
         user_id));
     pending_inactive_ = loading_.back();
   }
   return pending_inactive_;
 }
 
 }  // namespace chromeos