[Mac] "Refactor" DraggableButton into a mixin and impl.

chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 
+#include <complex>

[Mark Mentovai, 2011/08/11 00:51:17]

<cmath> (see elsewhere for rationale)

+
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "content/browser/user_metrics.h"
 
 // The opacity of the bookmark button drag image.
 static const CGFloat kDragImageOpacity = 0.7;
@@ skipping 98 matching lines @@
 
   return point;
 }
 
 
 - (void)updateTrackingAreas {
   [self installCustomTrackingArea];
   [super updateTrackingAreas];
 }
 
-- (BOOL)deltaIndicatesDragStartWithXDelta:(float)xDelta
-                                   yDelta:(float)yDelta
-                              xHysteresis:(float)xHysteresis
-                              yHysteresis:(float)yHysteresis {
+- (DraggableButtonResult)deltaIndicatesDragStartWithXDelta:(float)xDelta
+                                                    yDelta:(float)yDelta
+                                               xHysteresis:(float)xHysteresis
+                                               yHysteresis:(float)yHysteresis
+                                                 indicates:(BOOL*)result {
   const float kDownProportion = 1.4142135f; // Square root of 2.
 
   // We want to show a folder menu when you drag down on folder buttons,
   // so don't classify this as a drag for that case.
   if ([self isFolder] &&
-      (yDelta <= -yHysteresis) && // Bottom of hysteresis box was hit.
-      (ABS(yDelta)/ABS(xDelta)) >= kDownProportion)
-    return NO;
+      (yDelta <= -yHysteresis) &&  // Bottom of hysteresis box was hit.
+      (std::abs(yDelta) / std::abs(xDelta)) >= kDownProportion) {
+    *result = NO;
+    return kDraggableButtonMixinDidWork;
+  }
 
-  return [super deltaIndicatesDragStartWithXDelta:xDelta
-                                           yDelta:yDelta
-                                      xHysteresis:xHysteresis
-                                      yHysteresis:yHysteresis];
+  return kDraggableButtonImplUseBase;
 }
 
 
 // By default, NSButton ignores middle-clicks.
 // But we want them.
 - (void)otherMouseUp:(NSEvent*)event {
   [self performClick:self];
 }
 
 - (BOOL)acceptsTrackInFrom:(id)sender {
@@ skipping 59 matching lines @@
   [self setHidden:NO];
 
   // And we're done.
   dragPending_ = NO;
   gDraggedButton = nil;
 
   [self autorelease];
 }
 
 // Overridden to release bar visibility.
-- (void)endDrag {
+- (DraggableButtonResult)endDrag {
   gDraggedButton = nil;
 
   // visibilityDelegate_ can be nil if we're detached, and that's fine.
   [visibilityDelegate_ releaseBarVisibilityForOwner:self
                                       withAnimation:YES
                                               delay:YES];
   visibilityDelegate_ = nil;
-  [super endDrag];
+
+  return kDraggableButtonImplUseBase;

[Mark Mentovai, 2011/08/11 00:51:17]

In a sense, this is actually cleaner than what it replaces.

 }
 
 - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal {
   NSDragOperation operation = NSDragOperationCopy;
   if (isLocal) {
     operation |= NSDragOperationMove;
   }
   if ([delegate_ canDragBookmarkButtonToTrash:self]) {
     operation |= NSDragOperationDelete;
   }
   return operation;
 }
 
 - (void)draggedImage:(NSImage *)anImage
              endedAt:(NSPoint)aPoint
            operation:(NSDragOperation)operation {
   gDraggedButton = nil;
   // Inform delegate of drag source that we're finished dragging,
   // so it can close auto-opened bookmark folders etc.
   [delegate_ bookmarkDragDidEnd:self
                       operation:operation];
   // Tell delegate if it should delete us.
   if (operation & NSDragOperationDelete) {
     dragEndScreenLocation_ = aPoint;
     [delegate_ didDragBookmarkToTrash:self];
   }
 }
 
-- (void)performMouseDownAction:(NSEvent*)theEvent {
+- (DraggableButtonResult)performMouseDownAction:(NSEvent*)theEvent {
   [[self target] performSelector:[self action] withObject:self];
-  self.actionHasFired = YES;
+  self.draggableButton.actionHasFired = YES;
+  return kDraggableButtonMixinDidWork;
 }
 
 // BookmarkButtonCell.  We redirect this information to our delegate.
 // The controller can then perform menu-like actions (e.g. "hover over
 // to open menu").
 - (void)mouseEntered:(NSEvent*)event {
   [delegate_ mouseEnteredButton:self event:event];
 }
 
 // See comments above mouseEntered:.
@@ skipping 13 matching lines @@
 
 + (BookmarkButton*)draggedButton {
   return gDraggedButton;
 }
 
 - (BOOL)canBecomeKeyView {
   return NO;
 }
 
 // This only gets called after a click that wasn't a drag, and only on folders.
-- (void)secondaryMouseUpAction:(BOOL)wasInside {
+- (DraggableButtonResult)secondaryMouseUpAction:(BOOL)wasInside {
   const NSTimeInterval kShortClickLength = 0.5;
   // Long clicks that end over the folder button result in the menu hiding.
-  if (wasInside && ([self durationMouseWasDown] > kShortClickLength)) {
+  if (wasInside &&
+      self.draggableButton.durationMouseWasDown > kShortClickLength) {
     [[self target] performSelector:[self action] withObject:self];
   } else {
     // Mouse tracked out of button during menu track. Hide menus.
     if (!wasInside)
       [delegate_ bookmarkDragDidEnd:self
                           operation:NSDragOperationNone];
   }
+  return kDraggableButtonMixinDidWork;
 }
 
 @end
 
 @implementation BookmarkButton(Private)
 
 
 - (void)installCustomTrackingArea {
   const NSTrackingAreaOptions options =
       NSTrackingActiveAlways |
@@ skipping 40 matching lines @@
   [image drawAtPoint:NSMakePoint(0, 0)
             fromRect:NSMakeRect(0, 0, NSWidth(bounds), NSHeight(bounds))
            operation:NSCompositeSourceOver
             fraction:kDragImageOpacity];
 
   [dragImage unlockFocus];
   return dragImage;
 }
 
 @end  // @implementation BookmarkButton(Private)