| 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 332b9c1b2ce78775af0df72ed3bcc7c7b179f75c..4b826e8b3138cf1a3b02d27fe20fa67864354031 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| @@ -11,11 +11,12 @@
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #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/policy/enterprise_install_attributes.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| +#include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "ui/gfx/image/image_skia.h"
|
|
|
| class PrefRegistrySimple;
|
| @@ -30,8 +31,7 @@ class KioskAppData;
|
| class KioskAppManagerObserver;
|
|
|
| // KioskAppManager manages cached app data.
|
| -class KioskAppManager : public content::NotificationObserver,
|
| - public KioskAppDataDelegate {
|
| +class KioskAppManager : public KioskAppDataDelegate {
|
| public:
|
| enum ConsumerKioskModeStatus {
|
| // Consumer kiosk mode can be enabled on this machine.
|
| @@ -152,11 +152,6 @@ class KioskAppManager : public content::NotificationObserver,
|
| // Update app data |apps_| based on CrosSettings.
|
| void UpdateAppData();
|
|
|
| - // content::NotificationObserver overrides:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| // KioskAppDataDelegate overrides:
|
| virtual void GetKioskAppIconCacheDir(base::FilePath* cache_dir) OVERRIDE;
|
| virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE;
|
| @@ -188,6 +183,11 @@ class KioskAppManager : public content::NotificationObserver,
|
| std::string auto_launch_app_id_;
|
| ObserverList<KioskAppManagerObserver, true> observers_;
|
|
|
| + scoped_ptr<CrosSettings::ObserverSubscription>
|
| + local_accounts_subscription_;
|
| + scoped_ptr<CrosSettings::ObserverSubscription>
|
| + local_account_auto_login_id_subscription_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
|
| };
|
|
|
|
|