Implement WebContentsView::GetDropData for Mac; disable on Aura

content/browser/web_contents/web_drag_dest_mac.mm

 // Copyright (c) 2012 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 "content/browser/web_contents/web_drag_dest_mac.h"
 
 #include "base/sys_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
@@ skipping 12 matching lines @@
 // |contents| is the WebContentsImpl representing this tab, used to communicate
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
 - (id)initWithWebContentsImpl:(WebContentsImpl*)contents {
   if ((self = [super init])) {
     webContents_ = contents;
   }
   return self;
 }
 
+- (WebDropData*)currentDropData {
+  return dropData_.get();
+}
+
 - (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;
+  currentOperation_ = 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 {
   DCHECK(view);
   NSPoint viewPoint =  [view convertPoint:windowPoint fromView:nil];
   NSRect viewFrame = [view frame];
   viewPoint.y = viewFrame.size.height - viewPoint.y;
@@ skipping 35 matching lines @@
       return NSDragOperationCopy;
     return NSDragOperationNone;
   }
 
   if (delegate_) {
     delegate_->DragInitialize(webContents_);
     delegate_->OnDragEnter();
   }
 
   // Fill out a WebDropData from pasteboard.
-  WebDropData data;
-  [self populateWebDropData:&data fromPasteboard:[info draggingPasteboard]];
+  dropData_.reset(new WebDropData());
+  [self populateWebDropData:dropData_.get()
+             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];
   webContents_->GetRenderViewHost()->DragTargetDragEnter(
-      data,
+      *dropData_,
       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_;
+  currentOperation_ = NSDragOperationCopy;
+  return currentOperation_;
 }
 
 - (void)draggingExited:(id<NSDraggingInfo>)info {
   DCHECK(currentRVH_);
   if (currentRVH_ != webContents_->GetRenderViewHost())
     return;
 
   // Nothing to do in the interstitial case.
 
   if (delegate_)
     delegate_->OnDragLeave();
 
   webContents_->GetRenderViewHost()->DragTargetDragLeave();
+  dropData_.reset();
 }
 
 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   DCHECK(currentRVH_);
   if (currentRVH_ != webContents_->GetRenderViewHost())
     [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];
   webContents_->GetRenderViewHost()->DragTargetDragOver(
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y),
       static_cast<WebDragOperationsMask>(mask));
 
   if (delegate_)
     delegate_->OnDragOver();
 
-  return current_operation_;
+  return currentOperation_;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   if (currentRVH_ != webContents_->GetRenderViewHost())
     [self draggingEntered:info view:view];
 
   // Check if we only allow navigation and navigate to a url on the pasteboard.
+  BOOL result = YES;
   if ([self onlyAllowsNavigation]) {
     NSPasteboard* pboard = [info draggingPasteboard];
     if ([pboard containsURLData]) {
       GURL url;
       ui::PopulateURLAndTitleFromPasteboard(&url, NULL, pboard, YES);
       webContents_->OpenURL(OpenURLParams(
           url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK,
           false));
-      return YES;
+    } else {
+      result = NO;
     }
-    return NO;
+  } else {
+    if (delegate_)
+      delegate_->OnDrop();
   }
 
-  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];
   webContents_->GetRenderViewHost()->DragTargetDrop(
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y));
 
-  return YES;
+  dropData_.reset();
+
+  return result;
 }
 
 // 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 39 matching lines @@
   // Get custom MIME data.
   if ([types containsObject:ui::kWebCustomDataPboardType]) {
     NSData* customData = [pboard dataForType:ui::kWebCustomDataPboardType];
     ui::ReadCustomDataIntoMap([customData bytes],
                               [customData length],
                               &data->custom_data);
   }
 }
 
 @end