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

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 // static
 ChromeLauncherController* ChromeLauncherController::instance_ = nullptr;
 
 ChromeLauncherController::~ChromeLauncherController() {
   if (instance_ == this)
     instance_ = nullptr;
 }
 
 void ChromeLauncherController::LaunchApp(const std::string& app_id,
+                                         const std::string& launch_id,
                                          ash::LaunchSource source,
                                          int event_flags) {
-  launcher_controller_helper_->LaunchApp(app_id, source, event_flags);
+  launcher_controller_helper_->LaunchApp(app_id, launch_id, source,
+                                         event_flags);
 }
 
 ChromeLauncherController::ChromeLauncherController() : observer_binding_(this) {
   DCHECK(!instance_);
   instance_ = this;
   // Start observing the shelf controller immediately.
   if (ConnectToShelfController()) {
     ash::mojom::ShelfObserverAssociatedPtrInfo ptr_info;
     observer_binding_.Bind(&ptr_info, shelf_controller_.associated_group());
     shelf_controller_->AddObserver(std::move(ptr_info));
@@ skipping 137 matching lines @@
   // TODO(msw): Avoid handling this pref change and forwarding the value to ash.
   ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id,
                                               auto_hide);
 }
 
 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id,
                                                  const gfx::ImageSkia& image) {
   // Implemented by subclasses; this should not be called.
   NOTREACHED();
 }