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

apps/launcher.cc

 // Copyright 2013 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 "apps/launcher.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 
@@ skipping 345 matching lines @@
 };
 
 }  // namespace
 
 void LaunchPlatformAppWithCommandLine(Profile* profile,
                                       const extensions::Extension* app,
                                       const base::CommandLine& command_line,
                                       const base::FilePath& current_directory,
                                       extensions::AppLaunchSource source,
                                       PlayStoreStatus play_store_status) {
+  LaunchPlatformAppWithCommandLineAndLaunchId(profile, app, "", command_line,
+                                              current_directory, source,
+                                              play_store_status);
+}
+
+void LaunchPlatformAppWithCommandLineAndLaunchId(
+    Profile* profile,
+    const extensions::Extension* app,
+    const std::string& launch_id,
+    const base::CommandLine& command_line,
+    const base::FilePath& current_directory,
+    extensions::AppLaunchSource source,
+    PlayStoreStatus play_store_status) {
   // An app with "kiosk_only" should not be installed and launched
   // outside of ChromeOS kiosk mode in the first place. This is a defensive
   // check in case this scenario does occur.
   if (extensions::KioskModeInfo::IsKioskOnly(app)) {
     bool in_kiosk_mode = false;
 #if defined(OS_CHROMEOS)
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
     in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp();
 #endif
     if (!in_kiosk_mode) {
       LOG(ERROR) << "App with 'kiosk_only' attribute must be run in "
-          << " ChromeOS kiosk mode.";
+                 << " ChromeOS kiosk mode.";
       NOTREACHED();
       return;
     }
   }
 
 #if defined(OS_WIN)
   base::CommandLine::StringType about_blank_url(
       base::ASCIIToUTF16(url::kAboutBlankURL));
 #else
   base::CommandLine::StringType about_blank_url(url::kAboutBlankURL);
 #endif
   base::CommandLine::StringVector args = command_line.GetArgs();
   // Browser tests will add about:blank to the command line. This should
   // never be interpreted as a file to open, as doing so with an app that
   // has write access will result in a file 'about' being created, which
   // causes problems on the bots.
   if (args.empty() || (command_line.HasSwitch(switches::kTestType) &&
                        args[0] == about_blank_url)) {
     std::unique_ptr<app_runtime::LaunchData> launch_data =
         base::MakeUnique<app_runtime::LaunchData>();
     if (play_store_status != PlayStoreStatus::PLAY_STORE_STATUS_UNKNOWN)
       launch_data->play_store_status = play_store_status;
+    launch_data->id.reset(new std::string(launch_id));

[stevenjb, 2016/12/09 17:00:56]

Rather than potentially allocating an empty string here, wrap this wit
if(!launch_id.empty())

[Andra Paraschiv, 2016/12/12 14:28:22]

Done.

     AppRuntimeEventRouter::DispatchOnLaunchedEvent(profile, app, source,
                                                    std::move(launch_data));
     return;
   }
 
   base::FilePath file_path(command_line.GetArgs()[0]);
   scoped_refptr<PlatformAppPathLauncher> launcher =
       new PlatformAppPathLauncher(profile, app, file_path);
   launcher->LaunchWithRelativePath(current_directory);
 }
@@ skipping 62 matching lines @@
 void LaunchPlatformAppWithUrl(Profile* profile,
                               const Extension* app,
                               const std::string& handler_id,
                               const GURL& url,
                               const GURL& referrer_url) {
   AppRuntimeEventRouter::DispatchOnLaunchedEventWithUrl(
       profile, app, handler_id, url, referrer_url);
 }
 
 }  // namespace apps