[Mac] Delete more bookmark bar folder code. This removes things that were missed last time.

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 "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"
@@ skipping 238 matching lines @@
   [delegate_ bookmarkDragDidEnd:self
                       operation:operation];
   // Tell delegate if it should delete us.
   if (operation & NSDragOperationDelete) {
     dragEndScreenLocation_ = aPoint;
     [delegate_ didDragBookmarkToTrash:self];
   }
 }
 
 - (void)performMouseDownAction:(NSEvent*)theEvent {
-  int eventMask = NSLeftMouseUpMask | NSMouseEnteredMask | NSMouseExitedMask |
-      NSLeftMouseDraggedMask;
-
-  BOOL keepGoing = YES;
   [[self target] performSelector:[self action] withObject:self];
   self.actionHasFired = YES;
-
-  DraggableButton* insideBtn = nil;
-
-  while (keepGoing) {
-    theEvent = [[self window] nextEventMatchingMask:eventMask];
-    if (!theEvent)
-      continue;
-
-    NSPoint mouseLoc = [self convertPoint:[theEvent locationInWindow]
-                                 fromView:nil];
-    BOOL isInside = [self mouse:mouseLoc inRect:[self bounds]];
-
-    switch ([theEvent type]) {
-      case NSMouseEntered:
-      case NSMouseExited: {
-        NSView* trackedView = (NSView*)[[theEvent trackingArea] owner];
-        if (trackedView && [trackedView isKindOfClass:[self class]]) {
-          BookmarkButton* btn = static_cast<BookmarkButton*>(trackedView);
-          if (![btn acceptsTrackInFrom:self])
-            break;
-          if ([theEvent type] == NSMouseEntered) {
-            [[NSCursor arrowCursor] set];
-            [[btn cell] mouseEntered:theEvent];
-            insideBtn = btn;
-          } else {
-            [[btn cell] mouseExited:theEvent];
-            if (insideBtn == btn)
-              insideBtn = nil;
-          }
-        }
-        break;
-      }
-      case NSLeftMouseDragged: {
-        if (insideBtn)
-          [insideBtn mouseDragged:theEvent];
-        break;
-      }
-      case NSLeftMouseUp: {
-        self.durationMouseWasDown = [theEvent timestamp] - self.whenMouseDown;
-        if (!isInside && insideBtn && insideBtn != self) {
-          // Has tracked onto another BookmarkButton menu item, and released,
-          // so fire its action.
-          [[insideBtn target] performSelector:[insideBtn action]
-                                   withObject:insideBtn];
-
-        } else {
-          [self secondaryMouseUpAction:isInside];
-          [[self cell] mouseExited:theEvent];
-          [[insideBtn cell] mouseExited:theEvent];
-        }
-        keepGoing = NO;
-        break;
-      }
-      default:
-        /* Ignore any other kind of event. */
-        break;
-    }
-  }
 }
 
-
-
-// mouseEntered: and mouseExited: are called from our
 // 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:.
 - (void)mouseExited:(NSEvent*)event {
   [delegate_ mouseExitedButton:self event:event];
 }
 
 - (void)mouseMoved:(NSEvent*)theEvent {
   if ([delegate_ respondsToSelector:@selector(mouseMoved:)])
     [id(delegate_) mouseMoved:theEvent];
 }
 
 - (void)mouseDragged:(NSEvent*)theEvent {
   if ([delegate_ respondsToSelector:@selector(mouseDragged:)])
     [id(delegate_) mouseDragged:theEvent];
 }
 
 + (BookmarkButton*)draggedButton {
   return gDraggedButton;
 }
 
 - (BOOL)canBecomeKeyView {

[mrossetti, 2011/08/08 21:42:24]

Does the default implementation already return NO? If so, this function could
just be removed.

[Robert Sesek, 2011/08/08 21:42:48]

I *think* it does, but it's not documented as such.

-  // If button is an item in a folder menu, don't become key.
-  return ![[self cell] isFolderButtonCell];
+  return NO;
 }
 
 // This only gets called after a click that wasn't a drag, and only on folders.
 - (void)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)) {
     [[self target] performSelector:[self action] withObject:self];
   } else {
     // Mouse tracked out of button during menu track. Hide menus.
@@ skipping 54 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)