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

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/ash/launcher/app_shortcut_launcher_item_controller.h"
 
 #include <stddef.h>
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
@@ skipping 47 matching lines @@
           chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_OFF)
     return true;
   return multi_user_util::IsProfileFromActiveUser(browser->profile());
 }
 
 }  // namespace
 
 // 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,
 // but do not have any associated windows (opening a shortcut will replace the
 // 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 =
       GetExtensionForAppID(app_id, controller->GetProfile());
   // Some unit tests have no real extension.
   if (extension) {
     set_refocus_url(GURL(
         extensions::AppLaunchInfo::GetLaunchWebURL(extension).spec() + "*"));
   }
 }
@@ skipping 283 matching lines @@
 
 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
   if (last_launch_attempt_.is_null() ||
       last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
           kClickSuppressionInMS) < base::Time::Now()) {
     last_launch_attempt_ = base::Time::Now();
     return true;
   }
   return false;
 }