Enhance chrome.app.window API with better shelf integration

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

Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h
index a34ba49e8379ce2ee02ee70c7e501770ee92e7fa..eb09a113380621ec65bb3d224c2042d9b6ddecaf 100644
--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <string>
 
+#include "ash/shelf/shelf_util.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 #include "extensions/browser/app_window/app_window_registry.h"
@@ -67,6 +68,9 @@ class ExtensionAppWindowLauncherController
   using AppControllerMap =
       std::map<std::string, ExtensionAppWindowLauncherItemController*>;
   using WindowToAppShelfIdMap = std::map<aura::Window*, std::string>;
+  using WindowControllerMap =
+      std::map<aura::Window*, ExtensionAppWindowLauncherItemController*>;
+  using WindowIdToShelfIdMap = std::map<std::string, ash::ShelfID>;
 
   // A set of unowned AppWindowRegistry pointers for loaded users.
   // Note that this will only be used with multiple users in the side by side
@@ -79,6 +83,13 @@ class ExtensionAppWindowLauncherController
   // Allows us to get from an aura::Window to the app shelf id.
   WindowToAppShelfIdMap window_to_app_shelf_id_map_;
 
+  // Map of secondary window to controller. Each secondary window has its own
+  // icon in the shelf.
+  WindowControllerMap secondary_window_controller_map_;
+
+  // Map of window id to shelf id.
+  WindowIdToShelfIdMap window_id_to_shelf_id_map_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController);
 };