Index: chrome/browser/cocoa/delayedmenu_button.h |
diff --git a/chrome/browser/cocoa/delayedmenu_button.h b/chrome/browser/cocoa/delayedmenu_button.h |
index 28c19773dad00ef4c1f2506da717f87dfe80c0de..1c0547e09277a8f6a31fde3cde00198fe76cad88 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 |