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

chrome/browser/ui/extensions/application_launch.cc

 // Copyright (c) 2012 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/extensions/application_launch.h"
 
 #include <string>
 
 #include "apps/launcher.h"
 #include "base/macros.h"
@@ skipping 287 matching lines @@
 WebContents* OpenEnabledApplication(const AppLaunchParams& params) {
   const Extension* extension = GetExtension(params);
   if (!extension)
     return NULL;
 
   WebContents* tab = NULL;
   ExtensionPrefs* prefs = ExtensionPrefs::Get(params.profile);
   prefs->SetActiveBit(extension->id(), true);
 
   if (CanLaunchViaEvent(extension)) {
-    apps::LaunchPlatformAppWithCommandLine(
-        params.profile, extension, params.command_line,
+    apps::LaunchPlatformAppWithCommandLineAndLaunchId(
+        params.profile, extension, params.launch_id, params.command_line,
         params.current_directory, params.source, params.play_store_status);
     return NULL;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.HostedAppLaunchContainer",
                             params.container,
                             extensions::NUM_LAUNCH_CONTAINERS);
 
   GURL url = UrlForExtension(extension, params.override_url);
   if (extension->from_bookmark()) {
@@ skipping 78 matching lines @@
   extensions::TabHelper::FromWebContents(tab)->UpdateShortcutOnLoadComplete();
 
   return tab;
 }
 
 bool CanLaunchViaEvent(const extensions::Extension* extension) {
   const extensions::Feature* feature =
       extensions::FeatureProvider::GetAPIFeature("app.runtime");
   return feature && feature->IsAvailableToExtension(extension).is_available();
 }