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

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

 // Copyright 2016 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_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_
 #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"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 
 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:
   explicit ArcAppDeferredLauncherController(
       ChromeLauncherControllerImpl* owner);
   ~ArcAppDeferredLauncherController() override;
 
   bool HasApp(const std::string& app_id) const;
 
   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,
                                 gfx::ImageSkia* image);
 
   // ArcAppListPrefs::Observer:
   void OnAppReadyChanged(const std::string& app_id, bool ready) override;
   void OnAppRemoved(const std::string& app_id) override;
 
   // arc::ArcAuthService::Observer:
@@ skipping 21 matching lines @@
 
   AppControllerMap app_controller_map_;
 
   // Always keep this the last member of this class.
   base::WeakPtrFactory<ArcAppDeferredLauncherController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_