arc: Support running Arc app in shelf

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 69f1f30e655545296367c065df4591c370677243..2fbfa14801b803236fd8d8044bb4165bd9fd200f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -47,6 +47,8 @@ class Profile;
 class AppWindowLauncherController;
 class TabContents;
 
+class ArcAppWindowLauncherController;

[xiyuan, 2016/03/23 23:22:53]

nit: not used?

[khmel, 2016/03/24 16:30:38]

Done.

+
 namespace ash {
 class ShelfItemDelegateManager;
 class ShelfModel;
@@ -389,7 +391,7 @@ class ChromeLauncherController
 
   // Access to the AppWindowLauncherController for tests.
   AppWindowLauncherController* app_window_controller_for_test() {
-    return app_window_controller_.get();
+    return app_window_controllers_[0].get();
   }
 
   bool CanPin(const std::string& app_id);
@@ -558,7 +560,7 @@ class ChromeLauncherController
   WebContentsToAppIDMap web_contents_to_app_id_;
 
   // Used to track app windows.
-  scoped_ptr<AppWindowLauncherController> app_window_controller_;
+  std::vector<scoped_ptr<AppWindowLauncherController>> app_window_controllers_;
 
   // Used to get app info for tabs.
   scoped_ptr<AppTabHelper> app_tab_helper_;