Also detect the retail mode screensaver if it is already present in the AppPack cache.

BUG=chromium-os:25463
TEST=The screensaver in retail mode works after a reboot


Review URL: http://codereview.chromium.org/9835011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128295 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/policy/app_pack_updater.cc b/chrome/browser/policy/app_pack_updater.cc
index f38755d..4eaf193 100644
--- a/chrome/browser/policy/app_pack_updater.cc
+++ b/chrome/browser/policy/app_pack_updater.cc
@@ -315,8 +315,18 @@ void AppPackUpdater::BlockingCheckCacheInternal(
 void AppPackUpdater::OnCacheUpdated(CacheEntryMap* cache_entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   cached_extensions_.swap(*cache_entries);
+
+  CacheEntryMap::iterator it = cached_extensions_.find(screen_saver_id_);
+  if (it != cached_extensions_.end()) {
+    SetScreenSaverPath(FilePath(it->second.path));
+    cached_extensions_.erase(it);
+  } else {
+    SetScreenSaverPath(FilePath());
+  }
+
   VLOG(1) << "Updated AppPack cache, there are " << cached_extensions_.size()
-          << " extensions cached.";
+          << " extensions cached and "
+          << (screen_saver_path_.empty() ? "no" : "the") << " screensaver";
   UpdateExtensionLoader();
   DownloadMissingExtensions();
 }