Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1914)

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more nit Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
index c2ec7a5057dc688e47979666d2721742e310c956..cb86acc82c18e0dca4bcf37844825a361f9a291a 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -82,8 +82,10 @@ const char kNewWallpaperLayoutNodeName[] = "layout";
const char kNewWallpaperLocationNodeName[] = "file";
const char kNewWallpaperTypeNodeName[] = "type";
+#if !defined(USE_ATHENA)
// Maximum number of wallpapers cached by CacheUsersWallpapers().
const int kMaxWallpapersToCache = 3;
+#endif
// Maximum number of entries in WallpaperManager::last_load_times_ .
const size_t kLastLoadsStatsMsMaxSize = 4;
@@ -1301,6 +1303,8 @@ bool WallpaperManager::GetWallpaperFromCache(const std::string& user_id,
}
void WallpaperManager::CacheUsersWallpapers() {
+#if !defined(USE_ATHENA)
+ // TODO(dpolukhin): crbug.com/408734.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
user_manager::UserList users = user_manager::UserManager::Get()->GetUsers();
@@ -1315,6 +1319,7 @@ void WallpaperManager::CacheUsersWallpapers() {
CacheUserWallpaper(user_id);
}
}
+#endif
}
void WallpaperManager::CacheUserWallpaper(const std::string& user_id) {
« no previous file with comments | « chrome/browser/chromeos/login/ui/lock_window_aura.cc ('k') | chrome/browser/extensions/display_info_provider_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698