diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 21:01:34 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 21:01:34 +0000 |
| commit | fa9ed6a0cd30041c269398e99f3f34ef070d8666 (patch) | |
| tree | 803e593f722de0fe0589f605008e2b83b9651c25 /chrome/browser/cocoa/toolbar_controller.h | |
| parent | df970ecba180164e86be3dc3a3b802e203295984 (diff) | |
| download | chromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.zip chromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.tar.gz chromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.tar.bz2 | |
Reapply menu model cleanups, with WrenchMenuModel being a SimpleMenuModel.
BUG=47320
TEST=compiles
Review URL: http://codereview.chromium.org/3184021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h index 68b57bf..525cf11 100644 --- a/chrome/browser/cocoa/toolbar_controller.h +++ b/chrome/browser/cocoa/toolbar_controller.h @@ -28,8 +28,8 @@ class LocationBar; class LocationBarViewMac; @class MenuButton; namespace ToolbarControllerInternal { -class MenuDelegate; class NotificationBridge; +class WrenchAcceleratorDelegate; } // namespace ToolbarControllerInternal class Profile; @class ReloadButton; @@ -74,7 +74,8 @@ class WrenchMenuModel; // Lazily-instantiated model and delegate for the menu on the // wrench button. Once visible, it will be non-null, but will not // reaped when the menu is hidden once it is initially shown. - scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_; + scoped_ptr<ToolbarControllerInternal::WrenchAcceleratorDelegate> + acceleratorDelegate_; scoped_ptr<WrenchMenuModel> wrenchMenuModel_; // Used for monitoring the optional toolbar button prefs. |