Fix menu scrolling and scroll-related item-bounds tracking in non-stick menu mode.

Refactor DraggableButton to remove some of the menu-related complexity I added and move it to BookmarkButton where it belongs.
Fix leak of the BookmarkButton tracking area.
Add support for receiving nil NSEvents.
BUG=75076, 75077
Review URL: http://codereview.chromium.org/6657027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77678 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/ui/cocoa/draggable_button.h b/chrome/browser/ui/cocoa/draggable_button.h
index ab74c2b..4e0d596 100644
--- a/chrome/browser/ui/cocoa/draggable_button.h
+++ b/chrome/browser/ui/cocoa/draggable_button.h
@@ -17,6 +17,13 @@
   NSTimeInterval whenMouseDown_;
 }
 
+@property NSTimeInterval durationMouseWasDown;
+
+@property NSTimeInterval whenMouseDown;
+
+// Whether the action has already fired for this click.
+@property(nonatomic) BOOL actionHasFired;
+
 // Enable or disable dragability for special buttons like "Other Bookmarks".
 @property(nonatomic) BOOL draggable;
 
@@ -31,11 +38,6 @@
 // -drag* methods of NSView when overriding this method.
 - (void)beginDrag:(NSEvent*)dragEvent;
 
-// Called internally. Default impl only returns YES if sender==self.
-// Override if your subclass wants to accept being tracked into while a
-// click is being tracked on another DraggableButton. Needed to support
-// buttons being used as fake menu items or menu titles, as BookmarkButton does.
-- (BOOL)acceptsTrackInFrom:(id)sender;
 
 // Override if you want to do any extra work on mouseUp, after a mouseDown
 // action has already fired.
@@ -65,8 +67,6 @@
                               yHysteresis:(float)yHysteresis;
 
 
-@property(nonatomic) NSTimeInterval durationMouseWasDown;
-
 @end  // @interface DraggableButton
 
 @interface DraggableButton (Private)