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

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 121 matching lines @@
   // Closes the specified item.
   virtual void Close(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is open.
   virtual bool IsOpen(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is for a platform app.
   virtual bool IsPlatformApp(ash::ShelfID id) = 0;
 
   // Opens a new instance of the application identified by |app_id|.
-  // Used by the app-list, and by pinned-app shelf items.
+  // Used by the app-list, and by pinned-app shelf items.|launch_id| is an id
+  // that can be passed to an app when launched in order to support multiple
+  // shelf items per app.
   void LaunchApp(const std::string& app_id,
+                 const std::string& launch_id,
                  ash::LaunchSource source,
                  int event_flags);

[stevenjb, 2016/12/05 16:47:31]

Same here, we seem to have a lot of existing calls to this.

[Andra Paraschiv, 2016/12/06 13:19:16]

Done.

 
   // If |app_id| is running, reactivates the app's most recently active window,
   // otherwise launches and activates the app.
   // Used by the app-list, and by pinned-app shelf items.
   virtual void ActivateApp(const std::string& app_id,
                            ash::LaunchSource source,
                            int event_flags) = 0;
 
   // Returns the launch type of app for the specified id.
   virtual extensions::LaunchType GetLaunchType(ash::ShelfID id) = 0;
@@ skipping 159 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_