Turning on MultiProfile by default for ChromeOS

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/ash_switches.h"
@@ skipping 526 matching lines @@
     RecordUma(info.type, -1);
     if (info == current_user_wallpaper_info_)
       return;
   }
   SetUserWallpaperNow(UserManager::Get()->GetLoggedInUser()->email());
 }
 
 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();
-         ++it) {
-      logged_in_users_names.insert((*it)->email());
+  // 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();
+       ++it) {
+    logged_in_users_names.insert((*it)->email());
+  }
+
+  CustomWallpaperMap logged_in_users_cache;
+  for (CustomWallpaperMap::iterator it = wallpaper_cache_.begin();
+       it != wallpaper_cache_.end(); ++it) {
+    if (logged_in_users_names.find(it->first) !=
+        logged_in_users_names.end()) {
+      logged_in_users_cache.insert(*it);
     }
-
-    CustomWallpaperMap logged_in_users_cache;
-    for (CustomWallpaperMap::iterator it = wallpaper_cache_.begin();
-         it != wallpaper_cache_.end(); ++it) {
-      if (logged_in_users_names.find(it->first) !=
-          logged_in_users_names.end()) {
-        logged_in_users_cache.insert(*it);
-      }
-    }
-    wallpaper_cache_ = logged_in_users_cache;
   }
+  wallpaper_cache_ = logged_in_users_cache;
 }
 
 base::FilePath WallpaperManager::GetCustomWallpaperPath(
     const char* sub_dir,
     const std::string& user_id_hash,
     const std::string& file) const {
   base::FilePath custom_wallpaper_path = GetCustomWallpaperDir(sub_dir);
   return custom_wallpaper_path.Append(user_id_hash).Append(file);
 }
 
@@ skipping 330 matching lines @@
       relative_path,
       layout,
       type,
       base::Time::Now().LocalMidnight()
   };
   SetUserWallpaperInfo(user_id, info, is_persistent);
   if (update_wallpaper) {
     GetPendingWallpaper(user_id, false)->ResetSetWallpaperImage(image, info);
   }
 
-  if (UserManager::IsMultipleProfilesAllowed())
-    wallpaper_cache_[user_id] = image;
+  wallpaper_cache_[user_id] = image;
 }
 
 void WallpaperManager::SetDefaultWallpaperNow(const std::string& user_id) {
   GetPendingWallpaper(user_id, false)->ResetSetDefaultWallpaper();
 }
 
 void WallpaperManager::SetDefaultWallpaperDelayed(const std::string& user_id) {
   GetPendingWallpaper(user_id, true)->ResetSetDefaultWallpaper();
 }
 
@@ skipping 160 matching lines @@
                                                  const gfx::ImageSkia& image,
                                                  ash::WallpaperLayout layout,
                                                  bool update_wallpaper) {
   DCHECK(UserManager::Get()->IsUserLoggedIn());
 
   // There is no visible background in kiosk mode.
   if (UserManager::Get()->IsLoggedInAsKioskApp())
     return;
   WallpaperInfo info;
   info.layout = layout;
-  if (UserManager::IsMultipleProfilesAllowed())
-    wallpaper_cache_[user_id] = image;
+  wallpaper_cache_[user_id] = image;
 
   if (update_wallpaper) {
     GetPendingWallpaper(last_selected_user_, false /* Not delayed */)
         ->ResetSetWallpaperImage(image, info);
   }
 }
 
 void WallpaperManager::UpdateWallpaper(bool clear_cache) {
   FOR_EACH_OBSERVER(Observer, observers_, OnUpdateWallpaperForTesting());
   if (clear_cache)
@@ skipping 372 matching lines @@
                            User::DEFAULT,
                            base::Time::Now().LocalMidnight()
                          };
     SetUserWallpaperInfo(user_id, info, true);
 
     if (update_wallpaper)
       DoSetDefaultWallpaper(user_id, on_finish.Pass());
     return;
   }
 
-  // Only cache the user wallpaper at login screen and for multi profile users.
-  if (!UserManager::Get()->IsUserLoggedIn() ||
-      UserManager::IsMultipleProfilesAllowed()) {
-    wallpaper_cache_[user_id] = user_image.image();
-  }
+  wallpaper_cache_[user_id] = user_image.image();
 
   if (update_wallpaper) {
     ash::Shell::GetInstance()
         ->desktop_background_controller()
         ->SetWallpaperImage(user_image.image(), layout);
   }
 }
 
 void WallpaperManager::SaveCustomWallpaper(
     const std::string& user_id_hash,
@@ skipping 373 matching lines @@
     }
   }
 
   if (need_update_screen) {
     DoSetDefaultWallpaper(std::string(),
                           MovableOnDestroyCallbackHolder().Pass());
   }
 }
 
 }  // namespace chromeos