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

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc

Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
index bd0482a01498714d852ab32bfdc439987ee0bdec..860dd4044b91d51f513c34758cc2e11548ffa16d 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
@@ -65,10 +65,12 @@ bool CanBrowserBeUsedForDirectActivation(Browser* browser,
 // static
 AppShortcutLauncherItemController* AppShortcutLauncherItemController::Create(
     const std::string& app_id,
+    const std::string& app_shelf_id,
     ChromeLauncherController* controller) {
   if (app_id == ArcSupportHost::kHostAppId || app_id == arc::kPlayStoreAppId)
     return new ArcPlaystoreShortcutLauncherItemController(controller);
-  return new AppShortcutLauncherItemController(app_id, controller);
+  return new AppShortcutLauncherItemController(app_id, app_shelf_id,
+                                               controller);
 }
 
 // Item controller for an app shortcut. Shortcuts track app and launcher ids,
@@ -76,9 +78,12 @@ AppShortcutLauncherItemController* AppShortcutLauncherItemController::Create(
 // item with the appropriate LauncherItemController type).
 AppShortcutLauncherItemController::AppShortcutLauncherItemController(
     const std::string& app_id,
+    const std::string& app_shelf_id,
     ChromeLauncherController* controller)
     : LauncherItemController(TYPE_SHORTCUT, app_id, controller),
-      chrome_launcher_controller_(controller) {
+      chrome_launcher_controller_(controller),
+      app_id_(app_id),
+      app_shelf_id_(app_shelf_id) {

[stevenjb, 2016/08/29 15:56:30]

These appear to be unused?

[Andra Paraschiv, 2016/08/30 09:58:24]

They are currently used in the GetShelfIDForAppIDAndLaunchID method to check for
app shortcut app_id and launch_id values.

[stevenjb, 2016/08/30 16:12:51]

Right, sorry, I was confused by the multiple meanings of app_shelf_id. launch_id
is much more clear, thanks for changing it.

   // To detect V1 applications we use their domain and match them against the
   // used URL. This will also work with applications like Google Drive.
   const Extension* extension =