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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Issue 491403003: Update cached kiosk app crx from usb stick. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Install external crx using LocalExtensionCache::PutExtension, and address other code review comment… Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/path_service.h" 14 #include "base/path_service.h"
14 #include "base/prefs/pref_registry_simple.h" 15 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
16 #include "base/prefs/scoped_user_pref_update.h" 17 #include "base/prefs/scoped_user_pref_update.h"
17 #include "base/stl_util.h" 18 #include "base/stl_util.h"
18 #include "base/sys_info.h" 19 #include "base/sys_info.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h" 21 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
21 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h" 22 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h"
22 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" 23 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
24 #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h"
23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
24 #include "chrome/browser/chromeos/policy/device_local_account.h" 26 #include "chrome/browser/chromeos/policy/device_local_account.h"
25 #include "chrome/browser/chromeos/settings/cros_settings.h" 27 #include "chrome/browser/chromeos/settings/cros_settings.h"
26 #include "chrome/browser/chromeos/settings/owner_key_util.h" 28 #include "chrome/browser/chromeos/settings/owner_key_util.h"
27 #include "chrome/browser/extensions/external_loader.h" 29 #include "chrome/browser/extensions/external_loader.h"
28 #include "chrome/browser/extensions/external_provider_impl.h" 30 #include "chrome/browser/extensions/external_provider_impl.h"
29 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
30 #include "chrome/common/extensions/extension_constants.h" 32 #include "chrome/common/extensions/extension_constants.h"
31 #include "chromeos/chromeos_paths.h" 33 #include "chromeos/chromeos_paths.h"
32 #include "chromeos/cryptohome/async_method_caller.h" 34 #include "chromeos/cryptohome/async_method_caller.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 69 }
68 70
69 } // namespace 71 } // namespace
70 72
71 // static 73 // static
72 const char KioskAppManager::kKioskDictionaryName[] = "kiosk"; 74 const char KioskAppManager::kKioskDictionaryName[] = "kiosk";
73 const char KioskAppManager::kKeyApps[] = "apps"; 75 const char KioskAppManager::kKeyApps[] = "apps";
74 const char KioskAppManager::kKeyAutoLoginState[] = "auto_login_state"; 76 const char KioskAppManager::kKeyAutoLoginState[] = "auto_login_state";
75 const char KioskAppManager::kIconCacheDir[] = "kiosk/icon"; 77 const char KioskAppManager::kIconCacheDir[] = "kiosk/icon";
76 const char KioskAppManager::kCrxCacheDir[] = "kiosk/crx"; 78 const char KioskAppManager::kCrxCacheDir[] = "kiosk/crx";
79 const char KioskAppManager::kCrxUnpackDir[] = "kiosk_unpack";
77 80
78 // static 81 // static
79 static base::LazyInstance<KioskAppManager> instance = LAZY_INSTANCE_INITIALIZER; 82 static base::LazyInstance<KioskAppManager> instance = LAZY_INSTANCE_INITIALIZER;
80 KioskAppManager* KioskAppManager::Get() { 83 KioskAppManager* KioskAppManager::Get() {
81 return instance.Pointer(); 84 return instance.Pointer();
82 } 85 }
83 86
84 // static 87 // static
85 void KioskAppManager::Shutdown() { 88 void KioskAppManager::Shutdown() {
86 if (instance == NULL) 89 if (instance == NULL)
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 apps_[i]->Load(); 366 apps_[i]->Load();
364 } 367 }
365 } 368 }
366 369
367 bool KioskAppManager::HasCachedCrx(const std::string& app_id) const { 370 bool KioskAppManager::HasCachedCrx(const std::string& app_id) const {
368 base::FilePath crx_path; 371 base::FilePath crx_path;
369 std::string version; 372 std::string version;
370 return GetCachedCrx(app_id, &crx_path, &version); 373 return GetCachedCrx(app_id, &crx_path, &version);
371 } 374 }
372 375
376 bool KioskAppManager::GetCachedCrx(const std::string& app_id,
377 base::FilePath* file_path,
378 std::string* version) const {
379 return external_cache_->GetExtension(app_id, file_path, version);
380 }
381
373 void KioskAppManager::AddObserver(KioskAppManagerObserver* observer) { 382 void KioskAppManager::AddObserver(KioskAppManagerObserver* observer) {
374 observers_.AddObserver(observer); 383 observers_.AddObserver(observer);
375 } 384 }
376 385
377 void KioskAppManager::RemoveObserver(KioskAppManagerObserver* observer) { 386 void KioskAppManager::RemoveObserver(KioskAppManagerObserver* observer) {
378 observers_.RemoveObserver(observer); 387 observers_.RemoveObserver(observer);
379 } 388 }
380 389
381 extensions::ExternalLoader* KioskAppManager::CreateExternalLoader() { 390 extensions::ExternalLoader* KioskAppManager::CreateExternalLoader() {
382 if (external_loader_created_) { 391 if (external_loader_created_) {
(...skipping 17 matching lines...) Expand all
400 } else { 409 } else {
401 LOG(ERROR) << "Can't find app in the cached externsions" 410 LOG(ERROR) << "Can't find app in the cached externsions"
402 << " id = " << id; 411 << " id = " << id;
403 } 412 }
404 } 413 }
405 414
406 void KioskAppManager::UpdateExternalCache() { 415 void KioskAppManager::UpdateExternalCache() {
407 UpdateAppData(); 416 UpdateAppData();
408 } 417 }
409 418
419 void KioskAppManager::OnKioskAppCacheUpdated(const std::string& app_id) {
420 FOR_EACH_OBSERVER(
421 KioskAppManagerObserver, observers_, OnKioskAppCacheUpdated(app_id));
422 }
423
424 void KioskAppManager::PutValidatedExternalExtension(
425 const std::string& app_id,
426 const base::FilePath& crx_path,
427 const std::string& version,
428 const ExternalCache::PutExternalExtensionCallback& callback) {
429 external_cache_->PutExternalExtension(app_id, crx_path, version, callback);
430 }
431
410 KioskAppManager::KioskAppManager() 432 KioskAppManager::KioskAppManager()
411 : ownership_established_(false), external_loader_created_(false) { 433 : ownership_established_(false), external_loader_created_(false) {
412 base::FilePath cache_dir; 434 base::FilePath cache_dir;
413 GetCrxCacheDir(&cache_dir); 435 GetCrxCacheDir(&cache_dir);
414 external_cache_.reset( 436 external_cache_.reset(
415 new ExternalCache(cache_dir, 437 new ExternalCache(cache_dir,
416 g_browser_process->system_request_context(), 438 g_browser_process->system_request_context(),
417 GetBackgroundTaskRunner(), 439 GetBackgroundTaskRunner(),
418 this, 440 this,
419 true /* always_check_updates */, 441 true /* always_check_updates */,
420 false /* wait_for_cache_initialization */)); 442 false /* wait_for_cache_initialization */));
421 UpdateAppData(); 443 UpdateAppData();
422 local_accounts_subscription_ = 444 local_accounts_subscription_ =
423 CrosSettings::Get()->AddSettingsObserver( 445 CrosSettings::Get()->AddSettingsObserver(
424 kAccountsPrefDeviceLocalAccounts, 446 kAccountsPrefDeviceLocalAccounts,
425 base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this))); 447 base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
426 local_account_auto_login_id_subscription_ = 448 local_account_auto_login_id_subscription_ =
427 CrosSettings::Get()->AddSettingsObserver( 449 CrosSettings::Get()->AddSettingsObserver(
428 kAccountsPrefDeviceLocalAccountAutoLoginId, 450 kAccountsPrefDeviceLocalAccountAutoLoginId,
429 base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this))); 451 base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
430 } 452 }
431 453
432 KioskAppManager::~KioskAppManager() {} 454 KioskAppManager::~KioskAppManager() {}
433 455
456 void KioskAppManager::MonitorKioskExternalUpdate() {
457 base::FilePath cache_dir;
458 GetCrxCacheDir(&cache_dir);
459 base::FilePath unpack_dir;
460 GetCrxUnpackDir(&unpack_dir);
461 usb_stick_updater_.reset(new KioskExternalUpdater(
462 GetBackgroundTaskRunner(), cache_dir, unpack_dir));
463 }
464
434 void KioskAppManager::CleanUp() { 465 void KioskAppManager::CleanUp() {
435 local_accounts_subscription_.reset(); 466 local_accounts_subscription_.reset();
436 local_account_auto_login_id_subscription_.reset(); 467 local_account_auto_login_id_subscription_.reset();
437 apps_.clear(); 468 apps_.clear();
469 usb_stick_updater_.reset();
438 external_cache_.reset(); 470 external_cache_.reset();
439 } 471 }
440 472
441 const KioskAppData* KioskAppManager::GetAppData( 473 const KioskAppData* KioskAppManager::GetAppData(
442 const std::string& app_id) const { 474 const std::string& app_id) const {
443 for (size_t i = 0; i < apps_.size(); ++i) { 475 for (size_t i = 0; i < apps_.size(); ++i) {
444 const KioskAppData* data = apps_[i]; 476 const KioskAppData* data = apps_[i];
445 if (data->app_id() == app_id) 477 if (data->app_id() == app_id)
446 return data; 478 return data;
447 } 479 }
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 dict_update->SetInteger(kKeyAutoLoginState, state); 611 dict_update->SetInteger(kKeyAutoLoginState, state);
580 prefs->CommitPendingWrite(); 612 prefs->CommitPendingWrite();
581 } 613 }
582 614
583 void KioskAppManager::GetCrxCacheDir(base::FilePath* cache_dir) { 615 void KioskAppManager::GetCrxCacheDir(base::FilePath* cache_dir) {
584 base::FilePath user_data_dir; 616 base::FilePath user_data_dir;
585 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)); 617 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
586 *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir); 618 *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir);
587 } 619 }
588 620
589 bool KioskAppManager::GetCachedCrx(const std::string& app_id, 621 void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) {
590 base::FilePath* file_path, 622 base::FilePath temp_dir;
591 std::string* version) const { 623 base::GetTempDir(&temp_dir);
592 return external_cache_->GetExtension(app_id, file_path, version); 624 *unpack_dir = temp_dir.AppendASCII(kCrxUnpackDir);
593 } 625 }
594 626
595 } // namespace chromeos 627 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698