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

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

 // Copyright 2016 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/arc_app_window_launcher_controller.h"
 
 #include <string>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 558 matching lines @@
 
   ArcAppWindowLauncherItemController* controller;
   AppControllerMap::iterator it = app_controller_map_.find(app_id);
   ash::ShelfID shelf_id = 0;
   if (it != app_controller_map_.end()) {
     controller = it->second;
     DCHECK_EQ(controller->app_id(), app_id);
     shelf_id = controller->shelf_id();
   } else {
     controller = new ArcAppWindowLauncherItemController(app_id, owner());
-    shelf_id = shelf_delegate_->GetShelfIDForAppID(app_id);
+    shelf_id = shelf_delegate_->GetShelfIDForAppID(app_id, app_id);
     if (shelf_id == 0) {
       // Map Play Store shelf icon to Arc Support host, to share one entry.
       shelf_id = owner()->CreateAppLauncherItem(controller, app_id,
                                                 ash::STATUS_RUNNING);
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
     app_controller_map_[app_id] = controller;
   }
   controller->AddWindow(app_window);
@@ skipping 39 matching lines @@
   if (orientation_lock == arc::mojom::OrientationLock::CURRENT) {
     // Resolve the orientation when it first resolved.
     orientation_lock = GetCurrentOrientation();
     app_window->set_requested_orientation_lock(orientation_lock);
   }
 
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->screen_orientation_controller()->LockOrientationForWindow(
       window, BlinkOrientationLockFromMojom(orientation_lock));
 }