diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 23:38:34 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 23:38:34 +0000 |
| commit | 3bb0b82f159c8784cd71a371d106eaefd97114e9 (patch) | |
| tree | 0adab0ba4b78f9caa42be944849a4ee0825dfbc7 /chrome/browser/cocoa/delayedmenu_button.h | |
| parent | 9dc32ca678b8295b5a68cd1ddf90467c8a4502cf (diff) | |
| download | chromium_src-3bb0b82f159c8784cd71a371d106eaefd97114e9.zip chromium_src-3bb0b82f159c8784cd71a371d106eaefd97114e9.tar.gz chromium_src-3bb0b82f159c8784cd71a371d106eaefd97114e9.tar.bz2 | |
Mac: Eliminate unintended "menu" method overrides.
This had the bad effect of showing bad/strange menus upon right-click on various buttons or, worse, crashing.
BUG=22148,23606
TEST=Right click on back/forwards buttons (after some navigation so that they're active), page/wrench buttons, and bookmark bar off-the-side button and make sure no menu is shown (and it that it doesn't crash). Also do so when the menu is active/highlighted with menu already showing.
Review URL: http://codereview.chromium.org/251091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/delayedmenu_button.h')
| -rw-r--r-- | chrome/browser/cocoa/delayedmenu_button.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/delayedmenu_button.h b/chrome/browser/cocoa/delayedmenu_button.h index 28c1977..1c0547e 100644 --- a/chrome/browser/cocoa/delayedmenu_button.h +++ b/chrome/browser/cocoa/delayedmenu_button.h @@ -10,8 +10,8 @@ #include "base/scoped_nsobject.h" @interface DelayedMenuButton : NSButton { - NSMenu* menu_; // Strong (retained). - BOOL menuEnabled_; + NSMenu* attachedMenu_; // Strong (retained). + BOOL attachedMenuEnabled_; } // The menu to display. Note that it should have no (i.e., a blank) title and @@ -20,10 +20,10 @@ // in the button. This might change if we ever switch to a pop-up. Our direct // use of the given NSMenu object means that the one can set and use NSMenu's // delegate as usual.) -@property(retain, nonatomic) NSMenu* menu; +@property(retain, nonatomic) NSMenu* attachedMenu; // Is the menu enabled? (If not, don't act like a click-hold button.) -@property(assign, nonatomic) BOOL menuEnabled; +@property(assign, nonatomic) BOOL attachedMenuEnabled; @end // @interface DelayedMenuButton |