Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

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: 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:
View side-by-side diff with in-line comments
Download patch
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]);
tapted 2013/08/15 04:39:23 I think we should guard this with the enable app s
jackhou1 2013/08/16 02:50:41 Done.
}
- (void)unregisterEventHandlers {

Powered by Google App Engine
This is Rietveld 408576698