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..529d7f696defebee6d296ebf7a6487cb97543de9 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
@@ -67,6 +67,8 @@ class ExtensionAppWindowLauncherController
   using AppControllerMap =
       std::map<std::string, ExtensionAppWindowLauncherItemController*>;
   using WindowToAppShelfIdMap = std::map<aura::Window*, std::string>;
+  using WindowControllerMap =
+      std::map<aura::Window*, ExtensionAppWindowLauncherItemController*>;
 
   // 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 +81,10 @@ 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. The secondary window has its own

[stevenjb, 2016/05/03 20:39:49]

s/The/Each/

[Andra Paraschiv, 2016/05/04 11:59:09]

Done.

+  // icon in the shelf.
+  WindowControllerMap secondary_window_controller_map_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController);
 };