Not meant to be reviewed or checked in: bookmark bar dragging 06/14/2010

chrome/browser/cocoa/bookmark_bar_view.mm

 // Copyright (c) 2009 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/cocoa/bookmark_bar_view.h"
 
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #import "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_button.h"
@@ skipping 90 matching lines @@
 
 - (BookmarkBarController*)controller {
   return controller_;
 }
 
 -(void)drawRect:(NSRect)dirtyRect {
   [super drawRect:dirtyRect];
 
   // Draw the bookmark-button-dragging drop indicator if necessary.
   if (dropIndicatorShown_) {
+    NSLog(@"Drop Indicator Should Be Drawn!");
     const CGFloat kBarWidth = 1;
     const CGFloat kBarHalfWidth = kBarWidth / 2.0;
     const CGFloat kBarVertPad = 4;
     const CGFloat kBarOpacity = 0.85;
 
     // Prevent the indicator from being clipped on the left.
     CGFloat xLeft = MAX(dropIndicatorPosition_ - kBarHalfWidth, 0);
 
     NSRect uglyBlackBar =
         NSMakeRect(xLeft, kBarVertPad,
@@ skipping 54 matching lines @@
 
 - (void)draggingEnded:(id<NSDraggingInfo>)info {
   // For now, we just call |-draggingExited:|.
   [self draggingExited:info];
 }
 
 - (BOOL)wantsPeriodicDraggingUpdates {
   // TODO(port): This should probably return |YES| and the controller should
   // slide the existing bookmark buttons interactively to the side to make
   // room for the about-to-be-dropped bookmark.
-  return NO;
+  return YES;
 }
 
 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info {
   // For now it's the same as draggingEntered:.
   // TODO(jrg): once we return YES for wantsPeriodicDraggingUpdates,
   // this should ping the controller_ to perform animations.
+  if ([self wantsPeriodicDraggingUpdates]) {
+    BOOL dragCouldHappen = [controller_ shouldShowIndicatorShownForPoint:
+                               [info draggingLocation]];
+    if (dragCouldHappen) {
+      [controller_ performPeriodicDraggingUpdates:info];
+    }
+
+    // TODO: Something needs to happen for the case where a drag occurs
+    // from another place (web_drop_target, url_drop_target). Preferrably, 
+    // a button will appear that can be dragged.  Alternatively, we're still
+    // going to want to show the drop indicator for now.  How can we check where
+    // the drop is coming from?
+
+    [controller_ draggingEntered:info];  // allow hover-open to work.
+    return [info draggingSource] ? NSDragOperationMove : NSDragOperationCopy;
+  }
+
   return [self draggingEntered:info];
 }
 
 - (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)info {
   return YES;
 }
 
 // Implement NSDraggingDestination protocol method
 // performDragOperation: for URLs.
 - (BOOL)performDragOperationForURL:(id<NSDraggingInfo>)info {
@@ skipping 41 matching lines @@
       return YES;
   }
   return NO;
 }
 
 - (void)setController:(id)controller {
   controller_ = controller;
 }
 
 @end  // @implementation BookmarkBarView