Merge 244632 "kiosk: Do update check during launch."

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

 // Copyright 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/app_mode/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 251 matching lines @@
         it->kiosk_app_id == app_id) {
       device_local_accounts.erase(it);
       break;
     }
   }
 
   policy::SetDeviceLocalAccounts(CrosSettings::Get(), device_local_accounts);
 }
 
 void KioskAppManager::GetApps(Apps* apps) const {
+  apps->clear();
   apps->reserve(apps_.size());
   for (size_t i = 0; i < apps_.size(); ++i)
     apps->push_back(App(*apps_[i]));
 }
 
 bool KioskAppManager::GetApp(const std::string& app_id, App* app) const {
   const KioskAppData* data = GetAppData(app_id);
   if (!data)
     return false;
 
@@ skipping 13 matching lines @@
 bool KioskAppManager::GetDisableBailoutShortcut() const {
   bool enable;
   if (CrosSettings::Get()->GetBoolean(
           kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, &enable)) {
     return !enable;
   }
 
   return false;
 }
 
+void KioskAppManager::ClearAppData(const std::string& app_id) {
+  KioskAppData* app_data = GetAppDataMutable(app_id);
+  if (!app_data)
+    return;
+
+  app_data->ClearCache();
+}
+
+void KioskAppManager::UpdateAppDataFromProfile(
+    const std::string& app_id,
+    Profile* profile,
+    const extensions::Extension* app) {
+  KioskAppData* app_data = GetAppDataMutable(app_id);
+  if (!app_data)
+    return;
+
+  app_data->LoadFromInstalledApp(profile, app);
+}
+
 void KioskAppManager::AddObserver(KioskAppManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void KioskAppManager::RemoveObserver(KioskAppManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 KioskAppManager::KioskAppManager() : ownership_established_(false) {
   UpdateAppData();
@@ skipping 19 matching lines @@
     const std::string& app_id) const {
   for (size_t i = 0; i < apps_.size(); ++i) {
     const KioskAppData* data = apps_[i];
     if (data->app_id() == app_id)
       return data;
   }
 
   return NULL;
 }
 
+KioskAppData* KioskAppManager::GetAppDataMutable(const std::string& app_id) {
+  return const_cast<KioskAppData*>(GetAppData(app_id));
+}
+
 void KioskAppManager::UpdateAppData() {
   // Gets app id to data mapping for existing apps.
   std::map<std::string, KioskAppData*> old_apps;
   for (size_t i = 0; i < apps_.size(); ++i)
     old_apps[apps_[i]->app_id()] = apps_[i];
   apps_.weak_clear();  // |old_apps| takes ownership
 
   auto_launch_app_id_.clear();
   std::string auto_login_account_id;
   CrosSettings::Get()->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
@@ skipping 72 matching lines @@
 
 void KioskAppManager::SetAutoLoginState(AutoLoginState state) {
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate dict_update(prefs,
                                    KioskAppManager::kKioskDictionaryName);
   dict_update->SetInteger(kKeyAutoLoginState, state);
   prefs->CommitPendingWrite();
 }
 
 }  // namespace chromeos