Commit 71421bc2 authored by rsesek@chromium.org's avatar rsesek@chromium.org

[Mac] Placate the stupid compiler.

BUG=none
TEST=gcc

Review URL: http://codereview.chromium.org/7623024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96438 0039d316-1c4b-4281-b951-d872f2087c98
parent c02955a8
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
NSCell* cell = [self cell]; NSCell* cell = [self cell];
DCHECK([cell respondsToSelector:@selector(isMouseOverButtonPart)]); DCHECK([cell respondsToSelector:@selector(isMouseOverButtonPart)]);
if ([reinterpret_cast<DownloadItemCell*>(cell) isMouseOverButtonPart]) { if ([reinterpret_cast<DownloadItemCell*>(cell) isMouseOverButtonPart]) {
[self.draggableButton mouseDown:event]; [self.draggableButton mouseDownImpl:event];
} else { } else {
// Hold a reference to our controller in case the download completes and we // Hold a reference to our controller in case the download completes and we
// represent a file that's auto-removed (e.g. a theme). // represent a file that's auto-removed (e.g. a theme).
......
...@@ -29,12 +29,14 @@ ...@@ -29,12 +29,14 @@
} }
- (void)mouseUp:(NSEvent*)theEvent { - (void)mouseUp:(NSEvent*)theEvent {
if ([draggableButtonImpl_ mouseUp:theEvent] == kDraggableButtonMixinCallSuper) if ([draggableButtonImpl_ mouseUpImpl:theEvent] ==
kDraggableButtonMixinCallSuper) {
[super mouseUp:theEvent]; [super mouseUp:theEvent];
}
} }
- (void)mouseDown:(NSEvent*)theEvent { - (void)mouseDown:(NSEvent*)theEvent {
if ([draggableButtonImpl_ mouseDown:theEvent] == if ([draggableButtonImpl_ mouseDownImpl:theEvent] ==
kDraggableButtonMixinCallSuper) { kDraggableButtonMixinCallSuper) {
[super mouseDown:theEvent]; [super mouseDown:theEvent];
} }
......
...@@ -126,8 +126,8 @@ enum DraggableButtonResult { ...@@ -126,8 +126,8 @@ enum DraggableButtonResult {
// NSResponder implementation. NSButton subclasses should invoke these methods // NSResponder implementation. NSButton subclasses should invoke these methods
// and only call super if the return value indicates such. // and only call super if the return value indicates such.
- (DraggableButtonResult)mouseDown:(NSEvent*)event; - (DraggableButtonResult)mouseDownImpl:(NSEvent*)event;
- (DraggableButtonResult)mouseUp:(NSEvent*)event; - (DraggableButtonResult)mouseUpImpl:(NSEvent*)event;
@end @end
......
...@@ -64,7 +64,7 @@ const CGFloat kDragExpirationTimeout = 0.45; ...@@ -64,7 +64,7 @@ const CGFloat kDragExpirationTimeout = 0.45;
// NSButton/NSResponder Implementations //////////////////////////////////////// // NSButton/NSResponder Implementations ////////////////////////////////////////
- (DraggableButtonResult)mouseUp:(NSEvent*)theEvent { - (DraggableButtonResult)mouseUpImpl:(NSEvent*)theEvent {
durationMouseWasDown_ = [theEvent timestamp] - whenMouseDown_; durationMouseWasDown_ = [theEvent timestamp] - whenMouseDown_;
if (actionHasFired_) if (actionHasFired_)
...@@ -85,7 +85,7 @@ const CGFloat kDragExpirationTimeout = 0.45; ...@@ -85,7 +85,7 @@ const CGFloat kDragExpirationTimeout = 0.45;
// Mimic "begin a click" operation visually. Do NOT follow through with normal // Mimic "begin a click" operation visually. Do NOT follow through with normal
// button event handling. // button event handling.
- (DraggableButtonResult)mouseDown:(NSEvent*)theEvent { - (DraggableButtonResult)mouseDownImpl:(NSEvent*)theEvent {
[[NSCursor arrowCursor] set]; [[NSCursor arrowCursor] set];
whenMouseDown_ = [theEvent timestamp]; whenMouseDown_ = [theEvent timestamp];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment