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

Unified Diff: chrome/browser/cocoa/toolbar_controller.mm

Issue 482006: Make a shared app menu model and update win and mac to use it. Remove the NSM... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years 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
« no previous file with comments | « chrome/browser/cocoa/toolbar_controller.h ('k') | chrome/browser/defaults.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/toolbar_controller.mm
===================================================================
--- chrome/browser/cocoa/toolbar_controller.mm (revision 34553)
+++ chrome/browser/cocoa/toolbar_controller.mm (working copy)
@@ -10,6 +10,7 @@
#include "base/sys_string_conversions.h"
#include "base/gfx/rect.h"
#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_menu_model.h"
#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/bubble_positioner.h"
@@ -472,13 +473,18 @@
- (void)installPageWrenchMenus {
if (pageMenuModel_.get())
return;
- pageMenuDelegate_.reset(
- new ToolbarControllerInternal::MenuDelegate(browser_));
- pageMenuModel_.reset(new PageMenuModel(pageMenuDelegate_.get(), browser_));
+ menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_));
+ pageMenuModel_.reset(new PageMenuModel(menuDelegate_.get(), browser_));
pageMenuController_.reset(
[[MenuController alloc] initWithModel:pageMenuModel_.get()
- useWithPopUpButtonCell:YES]);
+ useWithPopUpButtonCell:YES]);
[pageButton_ setAttachedMenu:[pageMenuController_ menu]];
+
+ appMenuModel_.reset(new AppMenuModel(menuDelegate_.get(), browser_));
+ appMenuController_.reset(
+ [[MenuController alloc] initWithModel:appMenuModel_.get()
+ useWithPopUpButtonCell:YES]);
+ [wrenchButton_ setAttachedMenu:[appMenuController_ menu]];
}
// Show or hide the page and wrench buttons based on the pref.
« no previous file with comments | « chrome/browser/cocoa/toolbar_controller.h ('k') | chrome/browser/defaults.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698