[Merge to 2924] Reland "Propagate information about how ARC apps are launched"

chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
index 0ade5aa923d94f551c81fa4fa3ad05da139bf4fc..e25c3f16a27ad5c5b83c8d5d3cb56fe8044a8a1b 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_
 
 #include <map>
+#include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -17,6 +18,9 @@
 class ArcAppDeferredLauncherItemController;
 class ChromeLauncherControllerImpl;
 
+// ArcAppDeferredLauncherController displays visual feedback that the ARC
+// application the user has just activated is waiting for ARC to be ready, and
+// will be asynchronously launched as soon as it can.
 class ArcAppDeferredLauncherController : public ArcAppListPrefs::Observer,
                                          public arc::ArcAuthService::Observer {
  public:
@@ -28,8 +32,10 @@ class ArcAppDeferredLauncherController : public ArcAppListPrefs::Observer,
 
   base::TimeDelta GetActiveTime(const std::string& app_id) const;
 
-  // Registers deferred Arc app launch.
-  void RegisterDeferredLaunch(const std::string& app_id);
+  // Registers deferred ARC app launch. |app_id| is the app to be launched, and
+  // |event_flags| describes the original event flags that triggered the app's
+  // activation.
+  void RegisterDeferredLaunch(const std::string& app_id, int event_flags);
 
   // Applies spinning effect if requested app is handled by deferred controller.
   void MaybeApplySpinningEffect(const std::string& app_id,