diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 15:44:20 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 15:44:20 +0000 |
| commit | 0dad8074499c8a2784505f826505bd8862d618a1 (patch) | |
| tree | 810223f3f6cdb45f9faaad7d1e713b89d2f345cc /chrome/browser/cocoa/toolbar_controller.mm | |
| parent | 3eaf0ecd7a4882482d6234f7a115d1b019c13339 (diff) | |
| download | chromium_src-0dad8074499c8a2784505f826505bd8862d618a1.zip chromium_src-0dad8074499c8a2784505f826505bd8862d618a1.tar.gz chromium_src-0dad8074499c8a2784505f826505bd8862d618a1.tar.bz2 | |
[Mac] Put buttons into the new unified Wrench menu.
This also makes changes to MenuController to support NIB-based initialization.
Screen shots: http://cl.ly/1cyU (en) and http://cl.ly/1cyE (ru).
BUG=47848
TEST=Click on Wrench menu and see buttons. Buttons perform their function.
Review URL: http://codereview.chromium.org/2923009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 1a3bc74..dab9537 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -8,6 +8,7 @@ #include "app/l10n_util_mac.h" #include "app/menus/accelerator_cocoa.h" +#include "app/menus/menu_model.h" #include "base/keyboard_codes.h" #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" @@ -31,6 +32,7 @@ #import "chrome/browser/cocoa/menu_controller.h" #import "chrome/browser/cocoa/reload_button.h" #import "chrome/browser/cocoa/toolbar_view.h" +#import "chrome/browser/cocoa/wrench_menu_controller.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" @@ -511,12 +513,15 @@ class PrefObserverBridge : public NotificationObserver { menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_)); wrenchMenuModel_.reset(new WrenchMenuModel(menuDelegate_.get(), browser_)); - wrenchMenuController_.reset( - [[MenuController alloc] initWithModel:wrenchMenuModel_.get() - useWithPopUpButtonCell:YES]); + [wrenchMenuController_ setModel:wrenchMenuModel_.get()]; + [wrenchMenuController_ setUseWithPopUpButtonCell:YES]; [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]]; } +- (WrenchMenuController*)wrenchMenuController { + return wrenchMenuController_; +} + - (void)prefChanged:(std::wstring*)prefName { if (!prefName) return; if (*prefName == prefs::kShowHomeButton) { |