Instantiate AppShimMenuController when app launcher is enabled. (Mac)

chrome/browser/app_controller_mac.mm

Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index a90577ad52f2e4a2e17096f8e92b5970b1053825..6f4249cc4bb5ea73e2d6c3fbc5f86cb42948b255 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -4,7 +4,6 @@
 
 #import "chrome/browser/app_controller_mac.h"
 
-#include "apps/app_shim/app_shim_mac.h"
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window_registry.h"
 #include "base/auto_reset.h"
@@ -681,8 +680,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
 
   // Start managing the menu for app windows. This needs to be done here because
   // main menu item titles are not yet initialized in awakeFromNib.
-  if (apps::IsAppShimsEnabled())

[Nico, 2013/11/01 23:48:00]

I suppose this becomes true some time after startup in your scenario. Could you
create the controller at that point?

[jackhou1, 2013/11/04 00:14:29]

It's not quite as neat. I've uploaded two options to minimize impact on startup
time. Patch 2 initializes the menu items lazily, but we still need to listen to
notifications. Patch 3 initializes the AppShimMenuController when the app
launcher is enabled, but we need to expose a method on AppController, and call
it from AppListServiceMac.

-    appShimMenuController_.reset([[AppShimMenuController alloc] init]);
+  appShimMenuController_.reset([[AppShimMenuController alloc] init]);
 
   // Build up the encoding menu, the order of the items differs based on the
   // current locale (see http://crbug.com/7647 for details).