Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: chrome/browser/cocoa/menu_button.h

Issue 251091: Mac: Eliminate unintended "menu" method overrides. (Closed)
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/delayedmenu_button_unittest.mm ('k') | chrome/browser/cocoa/menu_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/cocoa/delayedmenu_button_unittest.mm ('k') | chrome/browser/cocoa/menu_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698