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..c391627f21f279682253b1e463c2d5091253b81d 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
@@ -75,6 +77,7 @@ class ExtensionAppWindowLauncherController
 
   // Map of app launcher id to controller.
   AppControllerMap app_controller_map_;
+  WindowControllerMap window_controller_map_;

[stevenjb, 2016/04/26 16:30:00]

Comment this (and maybe place below window_to_app_shelf_id_map_ to match typedef
order.

[Andra Paraschiv, 2016/04/28 09:49:03]

Done.

 
   // Allows us to get from an aura::Window to the app shelf id.
   WindowToAppShelfIdMap window_to_app_shelf_id_map_;