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

Side by Side Diff: chrome/browser/cocoa/delayedmenu_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_ 5 #ifndef CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_
6 #define CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_ 6 #define CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/scoped_nsobject.h" 10 #include "base/scoped_nsobject.h"
11 11
12 @interface DelayedMenuButton : NSButton { 12 @interface DelayedMenuButton : NSButton {
13 NSMenu* menu_; // Strong (retained). 13 NSMenu* attachedMenu_; // Strong (retained).
14 BOOL menuEnabled_; 14 BOOL attachedMenuEnabled_;
15 } 15 }
16 16
17 // The menu to display. Note that it should have no (i.e., a blank) title and 17 // The menu to display. Note that it should have no (i.e., a blank) title and
18 // that the 0-th entry should be blank (and won't be displayed). (This is 18 // that the 0-th entry should be blank (and won't be displayed). (This is
19 // because we use a pulldown list, for which Cocoa uses the 0-th item as "title" 19 // because we use a pulldown list, for which Cocoa uses the 0-th item as "title"
20 // in the button. This might change if we ever switch to a pop-up. Our direct 20 // in the button. This might change if we ever switch to a pop-up. Our direct
21 // use of the given NSMenu object means that the one can set and use NSMenu's 21 // use of the given NSMenu object means that the one can set and use NSMenu's
22 // delegate as usual.) 22 // delegate as usual.)
23 @property(retain, nonatomic) NSMenu* menu; 23 @property(retain, nonatomic) NSMenu* attachedMenu;
24 24
25 // Is the menu enabled? (If not, don't act like a click-hold button.) 25 // Is the menu enabled? (If not, don't act like a click-hold button.)
26 @property(assign, nonatomic) BOOL menuEnabled; 26 @property(assign, nonatomic) BOOL attachedMenuEnabled;
27 27
28 @end // @interface DelayedMenuButton 28 @end // @interface DelayedMenuButton
29 29
30 #endif // CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_ 30 #endif // CHROME_BROWSER_COCOA_DELAYEDMENU_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller.mm ('k') | chrome/browser/cocoa/delayedmenu_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698