chrome/browser/app_controller_mac.mm - Issue 22867009: Swap main menu with app-specific menu when app window focused.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 22867009: Swap main menu with app-specific menu when app window focused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Don't recreate the menu each time. Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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..0a0987df4562065089f32ee827a7b664f1b162fe 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"

@@ -314,6 +315,9 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {

// Initialize the Profile menu.

[self initProfileMenu];

+ // Initialize the app menu controller.

+ appMenuController_.reset([[AppMenuController alloc] init]);

}

- (void)unregisterEventHandlers {