Lock screen for Chrome-Athena

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

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 267499d0e542eed07ba1525e12eb148abcced062..b01c11f9893df6e25899d4678ab62224f2b854ea 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,7 @@ bool WallpaperManager::GetWallpaperFromCache(const std::string& user_id,
 }
 
 void WallpaperManager::CacheUsersWallpapers() {
+#if !defined(USE_ATHENA)

[Jun Mukai, 2014/10/13 18:20:24]

bshe is working for wallpapers IIRC. Can you contact him?

[oshima, 2014/10/13 18:52:20]

crbug.com/408734

[Dmitry Polukhin, 2014/10/14 11:20:34]

Done.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   user_manager::UserList users = user_manager::UserManager::Get()->GetUsers();
 
@@ -1315,6 +1318,7 @@ void WallpaperManager::CacheUsersWallpapers() {
       CacheUserWallpaper(user_id);
     }
   }
+#endif
 }
 
 void WallpaperManager::CacheUserWallpaper(const std::string& user_id) {