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

chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_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/extension_app_window_launcher_item_controller.h"
 
 #include "ash/common/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
@@ skipping 33 matching lines @@
       *app_window->app_icon().ToSkBitmap(), skia::ImageOperations::RESIZE_BEST,
       kAppListIconSize, kAppListIconSize);
   return gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp));
 }
 
 }  // namespace
 
 ExtensionAppWindowLauncherItemController::
     ExtensionAppWindowLauncherItemController(
         Type type,
-        const std::string& app_shelf_id,
         const std::string& app_id,
+        const std::string& launch_id,
         ChromeLauncherController* controller)
-    : AppWindowLauncherItemController(type, app_shelf_id, app_id, controller) {}
+    : AppWindowLauncherItemController(type, app_id, launch_id, controller) {}
 
 ExtensionAppWindowLauncherItemController::
     ~ExtensionAppWindowLauncherItemController() {}
 
 void ExtensionAppWindowLauncherItemController::AddAppWindow(
     extensions::AppWindow* app_window) {
   if (app_window->window_type_is_panel() && type() != TYPE_APP_PANEL)
     LOG(ERROR) << "AppWindow of type Panel added to non-panel launcher item";
   DCHECK(window_to_app_window_.find(app_window->GetBaseWindow()) ==
          window_to_app_window_.end());
@@ skipping 90 matching lines @@
   if (type() == TYPE_APP_PANEL)
     return true;
   return AppWindowLauncherItemController::IsDraggable();
 }
 
 bool ExtensionAppWindowLauncherItemController::ShouldShowTooltip() {
   if (type() == TYPE_APP_PANEL && IsVisible())
     return false;
   return AppWindowLauncherItemController::ShouldShowTooltip();
 }