Split Mac WebDropTarget into two, content and chrome.

chrome/browser/ui/cocoa/tab_contents/web_drop_target.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/tab_contents/web_drop_target.h"
 
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/web_drag_dest_delegate.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using WebKit::WebDragOperationsMask;
 
 @implementation WebDropTarget
 
 // |contents| is the TabContents representing this tab, used to communicate
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
 - (id)initWithTabContents:(TabContents*)contents {
   if ((self = [super init])) {
     tabContents_ = contents;
   }
   return self;
 }
 
+- (void)setDragDelegate:(content::WebDragDestDelegate*)delegate {
+  delegate_ = delegate;
+}
+
 // Call to set whether or not we should allow the drop. Takes effect the
 // next time |-draggingUpdated:| is called.
 - (void)setCurrentOperation: (NSDragOperation)operation {
   current_operation_ = operation;
 }
 
 // Given a point in window coordinates and a view in that window, return a
 // flipped point in the coordinate system of |view|.
 - (NSPoint)flipWindowPointToView:(const NSPoint&)windowPoint
                             view:(NSView*)view {
@@ skipping 33 matching lines @@
   // Save off the RVH so we can tell if it changes during a drag. If it does,
   // we need to send a new enter message in draggingUpdated:.
   currentRVH_ = tabContents_->render_view_host();
 
   if ([self onlyAllowsNavigation]) {
     if ([[info draggingPasteboard] containsURLData])
       return NSDragOperationCopy;
     return NSDragOperationNone;
   }
 
-  if (!tab_)
-    tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tabContents_);
-
-  // If the tab is showing the bookmark manager, send BookmarkDrag events
-  BookmarkTabHelper::BookmarkDrag* dragDelegate =
-      tab_ ? tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() : NULL;
-  BookmarkNodeData dragData;
-  if(dragDelegate && dragData.ReadFromDragClipboard())
-    dragDelegate->OnDragEnter(dragData);
+  if (delegate_) {
+    delegate_->DragInitialize(tabContents_);
+    delegate_->OnDragEnter();
+  }
 
   // Fill out a WebDropData from pasteboard.
   WebDropData data;
   [self populateWebDropData:&data fromPasteboard:[info draggingPasteboard]];
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates. Both need to be flipped.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   NSDragOperation mask = [info draggingSourceOperationMask];
   tabContents_->render_view_host()->DragTargetDragEnter(data,
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y),
       static_cast<WebDragOperationsMask>(mask));
 
   // We won't know the true operation (whether the drag is allowed) until we
   // hear back from the renderer. For now, be optimistic:
   current_operation_ = NSDragOperationCopy;
   return current_operation_;
 }
 
 - (void)draggingExited:(id<NSDraggingInfo>)info {
   DCHECK(currentRVH_);
   if (currentRVH_ != tabContents_->render_view_host())
     return;
 
   // Nothing to do in the interstitial case.
 
+  if (delegate_)
+    delegate_->OnDragLeave();
+
   tabContents_->render_view_host()->DragTargetDragLeave();
 }
 
 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   DCHECK(currentRVH_);
   if (currentRVH_ != tabContents_->render_view_host())
     [self draggingEntered:info view:view];
 
   if ([self onlyAllowsNavigation]) {
     if ([[info draggingPasteboard] containsURLData])
       return NSDragOperationCopy;
     return NSDragOperationNone;
   }
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   NSDragOperation mask = [info draggingSourceOperationMask];
   tabContents_->render_view_host()->DragTargetDragOver(
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y),
       static_cast<WebDragOperationsMask>(mask));
 
-  // If the tab is showing the bookmark manager, send BookmarkDrag events
-  BookmarkTabHelper::BookmarkDrag* dragDelegate =
-      tab_ ? tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() : NULL;
-  BookmarkNodeData dragData;
-  if(dragDelegate && dragData.ReadFromDragClipboard())
-    dragDelegate->OnDragOver(dragData);
+  if (delegate_)
+    delegate_->OnDragOver();
+
   return current_operation_;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   if (currentRVH_ != tabContents_->render_view_host())
     [self draggingEntered:info view:view];
 
   // Check if we only allow navigation and navigate to a url on the pasteboard.
   if ([self onlyAllowsNavigation]) {
     NSPasteboard* pboard = [info draggingPasteboard];
     if ([pboard containsURLData]) {
       GURL url;
       ui::PopulateURLAndTitleFromPasteboard(&url, NULL, pboard, YES);
       tabContents_->OpenURL(url, GURL(), CURRENT_TAB,
                             content::PAGE_TRANSITION_AUTO_BOOKMARK);
       return YES;
     }
     return NO;
   }
 
-  // If the tab is showing the bookmark manager, send BookmarkDrag events
-  BookmarkTabHelper::BookmarkDrag* dragDelegate =
-      tab_ ? tab_->bookmark_tab_helper()->GetBookmarkDragDelegate() : NULL;
-  BookmarkNodeData dragData;
-  if(dragDelegate && dragData.ReadFromDragClipboard())
-    dragDelegate->OnDrop(dragData);
+  if (delegate_)
+    delegate_->OnDrop();
 
   currentRVH_ = NULL;
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates. Both need to be flipped.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   tabContents_->render_view_host()->DragTargetDrop(
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y));
 
-  // Focus the target browser.
-  Browser* browser = Browser::GetBrowserForController(
-      &tabContents_->controller(), NULL);
-  if (browser)
-    browser->window()->Show();
-
   return YES;
 }
 
 // Given |data|, which should not be nil, fill it in using the contents of the
 // given pasteboard.
 - (void)populateWebDropData:(WebDropData*)data
              fromPasteboard:(NSPasteboard*)pboard {
   DCHECK(data);
   DCHECK(pboard);
   NSArray* types = [pboard types];
@@ skipping 32 matching lines @@
         if (exists && !isDir)
           data->filenames.push_back(base::SysNSStringToUTF16(filename));
       }
     }
   }
 
   // TODO(pinkerton): Get file contents. http://crbug.com/34661
 }
 
 @end