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

chrome/browser/ui/extensions/application_launch.cc

Index: chrome/browser/ui/extensions/application_launch.cc
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index f734580c1db489a1440e8addffc1c8095ebdbab5..deea7614c999780de8bff966027f02d34ec6b8d7 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -305,9 +305,15 @@ WebContents* OpenEnabledApplication(const AppLaunchParams& params) {
   prefs->SetActiveBit(extension->id(), true);
 
   if (CanLaunchViaEvent(extension)) {
-    apps::LaunchPlatformAppWithCommandLine(
-        params.profile, extension, params.command_line,
-        params.current_directory, params.source, params.play_store_status);
+    if (params.launch_id.empty()) {
+      apps::LaunchPlatformAppWithCommandLine(
+          params.profile, extension, params.command_line,
+          params.current_directory, params.source, params.play_store_status);
+    } else {
+      apps::LaunchPlatformAppWithCommandLineAndLaunchId(
+          params.profile, extension, params.launch_id, params.command_line,
+          params.current_directory, params.source, params.play_store_status);
+    }
     return NULL;
   }