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

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window_registry.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 35 matching lines @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #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"
 #import "chrome/browser/ui/cocoa/confirm_quit.h"
 #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #import "chrome/browser/ui/cocoa/profile_menu_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
@@ skipping 241 matching lines @@
            selector:@selector(popoverDidClose:)
                name:NSPopoverDidCloseNotification
              object:nil];
   }
 
   // Set up the command updater for when there are no windows open
   [self initMenuState];
 
   // Initialize the Profile menu.
   [self initProfileMenu];
+
+  // Initialize the app menu controller.
+  appMenuController_.reset([[AppMenuController alloc] init]);

[tapted, 2013/08/15 04:39:23]

I think we should guard this with the enable app shims flag. If we check just
the flag (and not IsAppShimsEnabled), then maybe it's OK to land this with
shortcuts not yet implemented..

[jackhou1, 2013/08/16 02:50:41]

Done.

 }
 
 - (void)unregisterEventHandlers {
   NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
   [em removeEventHandlerForEventClass:kInternetEventClass
                            andEventID:kAEGetURL];
   [em removeEventHandlerForEventClass:cloud_print::kAECloudPrintClass
                            andEventID:cloud_print::kAECloudPrintClass];
   [em removeEventHandlerForEventClass:'WWW!'
                            andEventID:'OURL'];
@@ skipping 98 matching lines @@
   CHECK_EQ(0u, chrome::GetTotalBrowserCount());
 
   // Tell BrowserList not to keep the browser process alive. Once all the
   // browsers get dealloc'd, it will stop the RunLoop and fall back into main().
   chrome::EndKeepAlive();
 
   // Reset all pref watching, as this object outlives the prefs system.
   profilePrefRegistrar_.reset();
   localPrefRegistrar_.RemoveAll();
 
   [self unregisterEventHandlers];

[tapted, 2013/08/15 04:39:23]

You should call into appMenuController_ to unregisterEventHandlers here too, and
do the same in that function (i.e. [[NSNotificationCenter defaultCenter]
removeObserver:self]; ).

And then perhaps appMenuController_.reset().

There's also the option of removing the observer in AppMenuController dealloc
and doing _just_ a reset(), but I think it's better to guarantee the observer
removal at this point explicitly

[jackhou1, 2013/08/16 02:50:41]

Done.

 }
 
 - (void)didEndMainMessageLoop {
   DCHECK_EQ(0u, chrome::GetBrowserCount([self lastProfile],
                                         chrome::HOST_DESKTOP_TYPE_NATIVE));
   if (!chrome::GetBrowserCount([self lastProfile],
                                chrome::HOST_DESKTOP_TYPE_NATIVE)) {
     // As we're shutting down, we need to nuke the TabRestoreService, which
     // will start the shutdown of the NavigationControllers and allow for
     // proper shutdown. If we don't do this, Chrome won't shut down cleanly,
@@ skipping 974 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac