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

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

 // 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.
 
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
@@ skipping 111 matching lines @@
     bool ready) {
   if (!ready || app_controller_map_.empty())
     return;
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   AppControllerMap::const_iterator it = app_controller_map_.find(shelf_app_id);
   if (it == app_controller_map_.end())
     return;
 
+  // Preserve the event flags before |it| is invalidated in Close().
+  int event_flags = it->second->event_flags();
   Close(app_id);
 
-  arc::LaunchApp(observed_profile_, app_id);
+  arc::LaunchApp(observed_profile_, app_id, event_flags);
 }
 
 void ArcAppDeferredLauncherController::OnAppRemoved(const std::string& app_id) {
   Close(app_id);
 }
 
 void ArcAppDeferredLauncherController::OnOptInEnabled(bool enabled) {
   if (enabled)
     return;
 
@@ skipping 27 matching lines @@
 }
 
 void ArcAppDeferredLauncherController::RegisterNextUpdate() {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&ArcAppDeferredLauncherController::UpdateApps,
                             weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kUpdateIconIntervalMs));
 }
 
 void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
-    const std::string& app_id) {
+    const std::string& app_id,
+    int event_flags) {
   const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
   DCHECK(auth_service);
   DCHECK(auth_service->state() != arc::ArcAuthService::State::STOPPED);
   DCHECK(auth_service->state() != arc::ArcAuthService::State::NOT_INITIALIZED);
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
 
   if (shelf_id) {
     LauncherItemController* controller =
         owner_->GetLauncherItemController(shelf_id);
     if (controller &&
         controller->type() != LauncherItemController::TYPE_SHORTCUT) {
       // We are allowed to apply new deferred controller only over shortcut.
       return;
     }
   }
 
   ArcAppDeferredLauncherItemController* controller =
-      new ArcAppDeferredLauncherItemController(shelf_app_id, owner_,
-                                               weak_ptr_factory_.GetWeakPtr());
+      new ArcAppDeferredLauncherItemController(
+          shelf_app_id, owner_, event_flags, weak_ptr_factory_.GetWeakPtr());
   if (shelf_id == 0) {
     owner_->CreateAppLauncherItem(controller, shelf_app_id,
                                   ash::STATUS_RUNNING);
   } else {
     owner_->SetItemController(shelf_id, controller);
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[shelf_app_id] = controller;
 }