Enhance chrome.app.window API for shelf integration with restore support

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

Index: chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
index 222623a9168a1b2495699961653dbe5d8415cdd5..29307d4d837a20558e5f02d1af6b47554de29680 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
@@ -165,6 +165,7 @@ bool LauncherControllerHelper::IsValidIDForCurrentUser(
 }
 
 void LauncherControllerHelper::LaunchApp(const std::string& app_id,
+                                         const std::string& launch_id,
                                          ash::LaunchSource source,
                                          int event_flags) {
   const ArcAppListPrefs* arc_prefs = GetArcAppListPrefs();
@@ -202,6 +203,7 @@ void LauncherControllerHelper::LaunchApp(const std::string& app_id,
     params.override_url = net::AppendQueryParameter(
         extension_url, extension_urls::kWebstoreSourceField, source_value);
   }
+  params.launch_id = launch_id;
 
   OpenApplication(params);
 }
@@ -211,8 +213,8 @@ ArcAppListPrefs* LauncherControllerHelper::GetArcAppListPrefs() const {
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowFinished() {
-  LaunchApp(extension_enable_flow_->extension_id(), ash::LAUNCH_FROM_UNKNOWN,
-            ui::EF_NONE);
+  LaunchApp(extension_enable_flow_->extension_id(), "",
+            ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
   extension_enable_flow_.reset();
 }