[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

4 files changed, 9 insertions, 7 deletions

diff --git a/chrome/browser/ui/cocoa/download/download_item_button.mm b/chrome/browser/ui/cocoa/download/download_item_button.mm
index 8c2bc5d..d6f1c52 100644
--- a/chrome/browser/ui/cocoa/download/download_item_button.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_button.mm
@@ -30,7 +30,7 @@
   NSCell* cell = [self cell];
   DCHECK([cell respondsToSelector:@selector(isMouseOverButtonPart)]);
   if ([reinterpret_cast<DownloadItemCell*>(cell) isMouseOverButtonPart]) {
-    [self.draggableButton mouseDown:event];
+    [self.draggableButton mouseDownImpl:event];
   } else {
     // Hold a reference to our controller in case the download completes and we
     // represent a file that's auto-removed (e.g. a theme).
diff --git a/chrome/browser/ui/cocoa/draggable_button.mm b/chrome/browser/ui/cocoa/draggable_button.mm
index 5654d58..91e8ef2 100644
--- a/chrome/browser/ui/cocoa/draggable_button.mm
+++ b/chrome/browser/ui/cocoa/draggable_button.mm
@@ -29,12 +29,14 @@
 }
 
 - (void)mouseUp:(NSEvent*)theEvent {
-  if ([draggableButtonImpl_ mouseUp:theEvent] == kDraggableButtonMixinCallSuper)
+  if ([draggableButtonImpl_ mouseUpImpl:theEvent] ==
+          kDraggableButtonMixinCallSuper) {
     [super mouseUp:theEvent];
+  }
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
-  if ([draggableButtonImpl_ mouseDown:theEvent] ==
+  if ([draggableButtonImpl_ mouseDownImpl:theEvent] ==
           kDraggableButtonMixinCallSuper) {
     [super mouseDown:theEvent];
   }
diff --git a/chrome/browser/ui/cocoa/draggable_button_mixin.h b/chrome/browser/ui/cocoa/draggable_button_mixin.h
index c769bcd..5a5eb08 100644
--- a/chrome/browser/ui/cocoa/draggable_button_mixin.h
+++ b/chrome/browser/ui/cocoa/draggable_button_mixin.h
@@ -126,8 +126,8 @@ enum DraggableButtonResult {
 
 // NSResponder implementation. NSButton subclasses should invoke these methods
 // and only call super if the return value indicates such.
-- (DraggableButtonResult)mouseDown:(NSEvent*)event;
-- (DraggableButtonResult)mouseUp:(NSEvent*)event;
+- (DraggableButtonResult)mouseDownImpl:(NSEvent*)event;
+- (DraggableButtonResult)mouseUpImpl:(NSEvent*)event;
 
 @end
 
diff --git a/chrome/browser/ui/cocoa/draggable_button_mixin.mm b/chrome/browser/ui/cocoa/draggable_button_mixin.mm
index a704498..e28f674 100644
--- a/chrome/browser/ui/cocoa/draggable_button_mixin.mm
+++ b/chrome/browser/ui/cocoa/draggable_button_mixin.mm
@@ -64,7 +64,7 @@ const CGFloat kDragExpirationTimeout = 0.45;
 
 // NSButton/NSResponder Implementations ////////////////////////////////////////
 
-- (DraggableButtonResult)mouseUp:(NSEvent*)theEvent {
+- (DraggableButtonResult)mouseUpImpl:(NSEvent*)theEvent {
   durationMouseWasDown_ = [theEvent timestamp] - whenMouseDown_;
 
   if (actionHasFired_)
@@ -85,7 +85,7 @@ const CGFloat kDragExpirationTimeout = 0.45;
 
 // Mimic "begin a click" operation visually.  Do NOT follow through with normal
 // button event handling.
-- (DraggableButtonResult)mouseDown:(NSEvent*)theEvent {
+- (DraggableButtonResult)mouseDownImpl:(NSEvent*)theEvent {
   [[NSCursor arrowCursor] set];
 
   whenMouseDown_ = [theEvent timestamp];