Chromium Code Reviews| Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.h |
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h |
| index 7c1231504a1c95a8a99eafacc382390b14ffc68b..3fec37850ac47be374b67db6b9d8cd71f35521c1 100644 |
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h |
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h |
| @@ -15,6 +15,7 @@ |
| #include "base/memory/scoped_vector.h" |
| #include "base/observer_list.h" |
| #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" |
| +#include "chrome/browser/chromeos/extensions/external_cache.h" |
| #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" |
| #include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "ui/gfx/image/image_skia.h" |
| @@ -36,7 +37,8 @@ class KioskAppData; |
| class KioskAppManagerObserver; |
| // KioskAppManager manages cached app data. |
| -class KioskAppManager : public KioskAppDataDelegate { |
| +class KioskAppManager : public KioskAppDataDelegate, |
| + public ExternalCache::Delegate { |
| public: |
| enum ConsumerKioskAutoLaunchStatus { |
| // Consumer kiosk mode auto-launch feature can be enabled on this machine. |
| @@ -54,7 +56,7 @@ class KioskAppManager : public KioskAppDataDelegate { |
| // Struct to hold app info returned from GetApps() call. |
| struct App { |
| - explicit App(const KioskAppData& data); |
| + App(const KioskAppData& data, bool is_extension_pending); |
| App(); |
| ~App(); |
| @@ -179,6 +181,14 @@ class KioskAppManager : public KioskAppDataDelegate { |
| virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE; |
| virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE; |
| + // ExternalCache::Delegate: |
| + virtual void OnExtensionListsUpdated( |
| + const base::DictionaryValue* prefs) OVERRIDE; |
| + virtual void OnExtensionLoadedInCache(const std::string& id) OVERRIDE; |
| + virtual void OnExtensionDownloadFailed( |
| + const std::string& id, |
| + extensions::ExtensionDownloaderDelegate::Error error) OVERRIDE; |
| + |
| // Callback for EnterpriseInstallAttributes::LockDevice() during |
| // EnableConsumerModeKiosk() call. |
| void OnLockDevice( |
| @@ -210,6 +220,9 @@ class KioskAppManager : public KioskAppDataDelegate { |
| scoped_ptr<CrosSettings::ObserverSubscription> |
| local_account_auto_login_id_subscription_; |
| + base::FilePath cache_dir_; |
|
xiyuan
2014/05/02 18:33:51
nit: no need to keep as a member if it is only use
jennyz
2014/05/02 21:05:04
Done.
|
| + scoped_ptr<ExternalCache> external_cache_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(KioskAppManager); |
| }; |