Index: chrome/browser/cocoa/menu_button.h |
diff --git a/chrome/browser/cocoa/menu_button.h b/chrome/browser/cocoa/menu_button.h |
index 1fe6853e8bf9aa9c587213f0db60fd632d73aa43..c281e77130a675f5a6cd7695231065a161186c62 100644 |
--- a/chrome/browser/cocoa/menu_button.h |
+++ b/chrome/browser/cocoa/menu_button.h |
@@ -12,7 +12,7 @@ |
// |ClickHoldButtonCell| as cell. |
@interface MenuButton : NSButton { |
@private |
- IBOutlet NSMenu* menu_; |
+ IBOutlet NSMenu* attachedMenu_; |
} |
// The menu to display. Note that it should have no (i.e., a blank) title and |
@@ -21,7 +21,7 @@ |
// 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(assign, nonatomic) NSMenu* menu; |
+@property(assign, nonatomic) NSMenu* attachedMenu; |
@end // @interface MenuButton |