Swap main menu with app-specific menu when app window focused.

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 7c61f06bfa982a0d52c41fdbbc606a74e699f9c8..4a6579d18e0081d16cf11013de3a039e3af7c90e 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -53,6 +53,7 @@
 #include "chrome/browser/ui/browser_mac.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#import "chrome/browser/ui/cocoa/apps/app_menu_controller_mac.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ -433,6 +434,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
   localPrefRegistrar_.RemoveAll();
 
   [self unregisterEventHandlers];

[Robert Sesek, 2013/08/22 16:22:45]

nit: blank line after

[jackhou1, 2013/08/23 02:36:41]

Done.

+  appMenuController_.reset();
 }
 
 - (void)didEndMainMessageLoop {
@@ -651,6 +653,11 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
 
   [self setUpdateCheckInterval];
 
+  // 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 (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppShims))
+    appMenuController_.reset([[AppMenuController 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).
   // We need a valid g_browser_process to get the profile which is why we can't