Update cached kiosk app crx from usb stick.

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"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/owner_key_util.h"
 #include "chrome/browser/extensions/external_loader.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/cryptohome/async_method_caller.h"
@@ skipping 34 matching lines @@
 }
 
 }  // namespace
 
 // static
 const char KioskAppManager::kKioskDictionaryName[] = "kiosk";
 const char KioskAppManager::kKeyApps[] = "apps";
 const char KioskAppManager::kKeyAutoLoginState[] = "auto_login_state";
 const char KioskAppManager::kIconCacheDir[] = "kiosk/icon";
 const char KioskAppManager::kCrxCacheDir[] = "kiosk/crx";
+const char KioskAppManager::kCrxUnpackDir[] = "kiosk/unpack";

[xiyuan, 2014/08/23 18:11:57]

We should probably use "/tmp"

[jennyz, 2014/08/27 00:58:41]

Done.

 
 // static
 static base::LazyInstance<KioskAppManager> instance = LAZY_INSTANCE_INITIALIZER;
 KioskAppManager* KioskAppManager::Get() {
   return instance.Pointer();
 }
 
 // static
 void KioskAppManager::Shutdown() {
   if (instance == NULL)
@@ skipping 276 matching lines @@
       apps_[i]->Load();
   }
 }
 
 bool KioskAppManager::HasCachedCrx(const std::string& app_id) const {
   base::FilePath crx_path;
   std::string version;
   return GetCachedCrx(app_id, &crx_path, &version);
 }
 
+bool KioskAppManager::GetCachedCrx(const std::string& app_id,
+                                   base::FilePath* file_path,
+                                   std::string* version) const {
+  return external_cache_->GetExtension(app_id, file_path, version);
+}
+
 void KioskAppManager::AddObserver(KioskAppManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void KioskAppManager::RemoveObserver(KioskAppManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 extensions::ExternalLoader* KioskAppManager::CreateExternalLoader() {
   if (external_loader_created_) {
@@ skipping 17 matching lines @@
   } else {
     LOG(ERROR) << "Can't find app in the cached externsions"
                << " id = " << id;
   }
 }
 
 void KioskAppManager::UpdateExternalCache() {
   UpdateAppData();
 }
 
+void KioskAppManager::OnKioskAppCacheUpdated(const std::string& app_id) {
+  FOR_EACH_OBSERVER(
+      KioskAppManagerObserver, observers_, OnKioskAppCacheUpdated(app_id));
+}
+
 KioskAppManager::KioskAppManager()
     : ownership_established_(false), external_loader_created_(false) {
   base::FilePath cache_dir;
   GetCrxCacheDir(&cache_dir);
   external_cache_.reset(
       new ExternalCache(cache_dir,
                         g_browser_process->system_request_context(),
                         GetBackgroundTaskRunner(),
                         this,
                         true /* always_check_updates */,
                         false /* wait_for_cache_initialization */));
   UpdateAppData();
   local_accounts_subscription_ =
       CrosSettings::Get()->AddSettingsObserver(
           kAccountsPrefDeviceLocalAccounts,
           base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
   local_account_auto_login_id_subscription_ =
       CrosSettings::Get()->AddSettingsObserver(
           kAccountsPrefDeviceLocalAccountAutoLoginId,
           base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
 }
 
 KioskAppManager::~KioskAppManager() {}
 
+void KioskAppManager::MonitorKioskExternalUpdate() {
+  base::FilePath cache_dir;
+  GetCrxCacheDir(&cache_dir);
+  base::FilePath unpack_dir;
+  GetCrxUnpackDir(&unpack_dir);
+  usb_stick_updater_ = new KioskExternalUpdater(
+      GetBackgroundTaskRunner(), cache_dir, unpack_dir);
+}
+
 void KioskAppManager::CleanUp() {
   local_accounts_subscription_.reset();
   local_account_auto_login_id_subscription_.reset();
   apps_.clear();
+  usb_stick_updater_ = NULL;
   external_cache_.reset();
 }
 
 const KioskAppData* KioskAppManager::GetAppData(
     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;
   }
@@ skipping 131 matching lines @@
   dict_update->SetInteger(kKeyAutoLoginState, state);
   prefs->CommitPendingWrite();
 }
 
 void KioskAppManager::GetCrxCacheDir(base::FilePath* cache_dir) {
   base::FilePath user_data_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir);
 }
 
-bool KioskAppManager::GetCachedCrx(const std::string& app_id,
-                                   base::FilePath* file_path,
-                                   std::string* version) const {
-  return external_cache_->GetExtension(app_id, file_path, version);
+void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) {
+  base::FilePath user_data_dir;
+  CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
+  *unpack_dir = user_data_dir.AppendASCII(kCrxUnpackDir);
 }
 
 }  // namespace chromeos