arc: Fix Drag&Drop for PlayStore item from App List to Shelf.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index 66fc3b85a2e3f5291e5506d1d33a1e03db5ea378..624c3f5eab685a3b49e76fa55b08ef5e57b6c544 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -909,11 +909,13 @@ ash::ShelfID ChromeLauncherControllerImpl::GetShelfIDForAppID(
 ash::ShelfID ChromeLauncherControllerImpl::GetShelfIDForAppIDAndLaunchID(
     const std::string& app_id,
     const std::string& launch_id) {
+  const std::string shelf_app_id =
+      ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   for (const auto& id_to_item_controller_pair : id_to_item_controller_map_) {
     if (id_to_item_controller_pair.second->type() ==
         LauncherItemController::TYPE_APP_PANEL)
       continue;  // Don't include panels
-    if (id_to_item_controller_pair.second->app_id() == app_id &&
+    if (id_to_item_controller_pair.second->app_id() == shelf_app_id &&
         id_to_item_controller_pair.second->launch_id() == launch_id) {
       return id_to_item_controller_pair.first;
     }
@@ -934,27 +936,33 @@ const std::string& ChromeLauncherControllerImpl::GetAppIDForShelfID(
 }
 
 void ChromeLauncherControllerImpl::PinAppWithID(const std::string& app_id) {
-  if (GetPinnableForAppID(app_id, profile_) ==
+  const std::string shelf_app_id =
+      ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
+  if (GetPinnableForAppID(shelf_app_id, profile_) ==
       AppListControllerDelegate::PIN_EDITABLE)
-    DoPinAppWithID(app_id);
+    DoPinAppWithID(shelf_app_id);
   else
     NOTREACHED();
 }
 
 bool ChromeLauncherControllerImpl::IsAppPinned(const std::string& app_id) {
+  const std::string shelf_app_id =
+      ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   for (IDToItemControllerMap::const_iterator i =
            id_to_item_controller_map_.begin();
        i != id_to_item_controller_map_.end(); ++i) {
-    if (IsPinned(i->first) && i->second->app_id() == app_id)
+    if (IsPinned(i->first) && i->second->app_id() == shelf_app_id)
       return true;
   }
   return false;
 }
 
 void ChromeLauncherControllerImpl::UnpinAppWithID(const std::string& app_id) {
-  if (GetPinnableForAppID(app_id, profile_) ==
+  const std::string shelf_app_id =
+      ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
+  if (GetPinnableForAppID(shelf_app_id, profile_) ==

[Mr4D (OOO till 08-26), 2016/09/19 17:30:19]

The danger of having several app_id's. We might consider renaming one of them.
But since this seems to be urgent we can do that later...

       AppListControllerDelegate::PIN_EDITABLE)
-    DoUnpinAppWithID(app_id, true /* update_prefs */);
+    DoUnpinAppWithID(shelf_app_id, true /* update_prefs */);
   else
     NOTREACHED();
 }