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

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index 55cd0e7b27776d1d57cca1b2cdc44876190e394c..d9dd21c986b9950d18fa0c779ff77e0aa2fca195 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -18,6 +18,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"
 #include "components/prefs/pref_change_registrar.h"
@@ -146,6 +147,7 @@ class ChromeLauncherControllerImpl
       const std::string& launch_id) override;
   bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
+  const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override;

[stevenjb, 2016/10/21 21:40:40]

I agree with James' earlier comment. We can make this part of
ChromeLauncherController and eliminate a lot of unnecessary changes.

[Andra Paraschiv, 2016/10/24 08:26:16]

Thank you for this, Steven, I moved it from ash delegate to chrome launcher
controller. 

   void PinAppWithID(const std::string& app_id) override;
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
@@ -161,8 +163,9 @@ class ChromeLauncherControllerImpl
  protected:
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
-  ash::ShelfID CreateAppShortcutLauncherItem(const std::string& app_id,
-                                             int index);
+  ash::ShelfID CreateAppShortcutLauncherItem(
+      const ash::launcher::AppLauncherId& app_launcher_id,
+      int index);
 
   const std::string& GetAppIdFromShelfIdForTest(ash::ShelfID id);
 
@@ -184,7 +187,7 @@ class ChromeLauncherControllerImpl
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
   ash::ShelfID CreateAppShortcutLauncherItemWithType(
-      const std::string& app_id,
+      const ash::launcher::AppLauncherId& app_launcher_id,
       int index,
       ash::ShelfItemType shelf_item_type);