Updated KioskAppManager to track whether an app was auto-launched.

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
     // be enabled on this machine.
     CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED,
   };
 
   typedef base::Callback<void(bool success)> EnableKioskAutoLaunchCallback;
   typedef base::Callback<void(ConsumerKioskAutoLaunchStatus status)>
       GetConsumerKioskAutoLaunchStatusCallback;
 
   // 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,

[bartfab (slow), 2015/02/06 14:14:07]

Nit: The style guide says:

"For function declarations and definitions, put each argument on a separate line
unless the whole declaration fits on one line."

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done.

+        bool was_auto_launched_with_zero_delay);
     App();
     ~App();
 
     std::string app_id;
     std::string user_id;
     std::string name;
     gfx::ImageSkia icon;
     bool is_loading;
+    bool was_auto_launched_with_zero_delay;
   };
   typedef std::vector<App> Apps;
 
   // Name of a dictionary that holds kiosk app info in Local State.
   // Sample layout:
   //   "kiosk": {
   //     "auto_login_enabled": true  //
   //   }
   static const char kKioskDictionaryName[];
   static const char kKeyApps[];
@@ skipping 35 matching lines @@
 
   // Sets |app_id| as the app to auto launch at start up.
   void SetAutoLaunchApp(const std::string& app_id);
 
   // Returns true if there is a pending auto-launch request.
   bool IsAutoLaunchRequested() const;
 
   // Returns true if owner/policy enabled auto launch.
   bool IsAutoLaunchEnabled() const;
 
+  // Returns true if current app was auto launched.

[bartfab (slow), 2015/02/06 14:14:07]

Nit: ... with zero delay.

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done.

+  bool IsCurrentAppAutoLaunched() const;

[bartfab (slow), 2015/02/06 14:14:07]

Nit: WithZeroDelay.

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done.

+
   // Enable auto launch setter.
   void SetEnableAutoLaunch(bool value);
 
   // Adds/removes a kiosk app by id. When removed, all locally cached data
   // will be removed as well.
   void AddApp(const std::string& app_id);
   void RemoveApp(const std::string& app_id);
 
   // Gets info of all apps that have no meta data load error.
   void GetApps(Apps* apps) const;
@@ skipping 52 matching lines @@
 
   // Installs the validated external extension into cache.
   void PutValidatedExternalExtension(
       const std::string& app_id,
       const base::FilePath& crx_path,
       const std::string& version,
       const ExternalCache::PutExternalExtensionCallback& callback);
 
   bool external_loader_created() const { return external_loader_created_; }
 
+  // Notifies the KioskAppManager that a given app was auto-launched
+  // automatically with no delay on startup. Certain privacy-sensitive
+  // kiosk-mode behavior (such as network reporting) is only enabled for
+  // kiosk apps that are immediately auto-launched on startup.
+  void SetAppWasAutoLaunchedWithZeroDelay(const std::string& app_id);
+
  private:
   friend struct base::DefaultLazyInstanceTraits<KioskAppManager>;
   friend struct base::DefaultDeleter<KioskAppManager>;
   friend class KioskAppManagerTest;
   friend class KioskTest;
   friend class KioskUpdateTest;
 
   enum AutoLoginState {
     AUTOLOGIN_NONE      = 0,
     AUTOLOGIN_REQUESTED = 1,
@@ skipping 46 matching lines @@
   AutoLoginState GetAutoLoginState() const;
   void SetAutoLoginState(AutoLoginState state);
 
   void GetCrxCacheDir(base::FilePath* cache_dir);
   void GetCrxUnpackDir(base::FilePath* unpack_dir);
 
   // True if machine ownership is already established.
   bool ownership_established_;
   ScopedVector<KioskAppData> apps_;
   std::string auto_launch_app_id_;
+  std::string currently_auto_launched_app_;

[bartfab (slow), 2015/02/06 14:14:07]

Nit: For consistency, _with_zero_delay.

[Andrew T Wilson (Slow), 2015/02/06 20:43:50]

Done, but this is an incredibly unwieldy 44 character name now, and I think it's
a poor tradeoff of usability/readability vs consistency.

   ObserverList<KioskAppManagerObserver, true> observers_;
 
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_accounts_subscription_;
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_account_auto_login_id_subscription_;
 
   scoped_ptr<ExternalCache> external_cache_;
 
   scoped_ptr<KioskExternalUpdater> usb_stick_updater_;
 
   // The extension external loader for installing kiosk app.
   bool external_loader_created_;
   base::WeakPtr<KioskAppExternalLoader> external_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_