| 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 0084d54d11138eed116d3c67e725823b5a3fa87b..66e72968591db7f13f4cf585d8ded2475c553507 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
|
| @@ -59,7 +59,8 @@ class KioskAppManager : public KioskAppDataDelegate,
|
|
|
| // Struct to hold app info returned from GetApps() call.
|
| struct App {
|
| - App(const KioskAppData& data, bool is_extension_pending);
|
| + App(const KioskAppData& data, bool is_extension_pending,
|
| + bool was_auto_launched);
|
| App();
|
| ~App();
|
|
|
| @@ -68,6 +69,7 @@ class KioskAppManager : public KioskAppDataDelegate,
|
| std::string name;
|
| gfx::ImageSkia icon;
|
| bool is_loading;
|
| + bool was_auto_launched;
|
| };
|
| typedef std::vector<App> Apps;
|
|
|
| @@ -123,6 +125,9 @@ class KioskAppManager : public KioskAppDataDelegate,
|
| // Returns true if owner/policy enabled auto launch.
|
| bool IsAutoLaunchEnabled() const;
|
|
|
| + // Returns true if current app was auto launched.
|
| + bool IsCurrentAppAutoLaunched() const;
|
| +
|
| // Enable auto launch setter.
|
| void SetEnableAutoLaunch(bool value);
|
|
|
| @@ -195,6 +200,11 @@ class KioskAppManager : public KioskAppDataDelegate,
|
|
|
| bool external_loader_created() const { return external_loader_created_; }
|
|
|
| + // Notifies the KioskAppManager that a given app was auto-launched. Certain
|
| + // kiosk-mode behavior (such as network reporting) is only enabled for
|
| + // auto-launched kiosk apps.
|
| + void SetAppWasAutoLaunched(const std::string& app_id);
|
| +
|
| private:
|
| friend struct base::DefaultLazyInstanceTraits<KioskAppManager>;
|
| friend struct base::DefaultDeleter<KioskAppManager>;
|
| @@ -261,6 +271,7 @@ class KioskAppManager : public KioskAppDataDelegate,
|
| bool ownership_established_;
|
| ScopedVector<KioskAppData> apps_;
|
| std::string auto_launch_app_id_;
|
| + std::string currently_auto_launched_app_;
|
| ObserverList<KioskAppManagerObserver, true> observers_;
|
|
|
| scoped_ptr<CrosSettings::ObserverSubscription>
|
|
|