Implement WebContentsView::GetDropData for Mac; disable on Aura

content/browser/web_contents/web_contents_view_aura.cc

 // 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.
 
 #include "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 321 matching lines @@
   // |drag_handler_->CancelDrag()| is async.  Instead, set a flag to cancel
   // the drag and when the drag nested message loop ends, close the tab.
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
   if (aura::client::GetDragDropClient(root_window))
     aura::client::GetDragDropClient(root_window)->DragCancel();
 
   close_tab_after_drag_ends_ = true;
 }
 
 WebDropData* WebContentsViewAura::GetDropData() const {
-  return NULL;
+  return current_incoming_drop_data_.get();
 }
 
 bool WebContentsViewAura::IsEventTracking() const {
   return false;
 }
 
 void WebContentsViewAura::CloseTabAfterEventTracking() {
 }
 
 void WebContentsViewAura::GetViewBounds(gfx::Rect* out) const {
@@ skipping 205 matching lines @@
   else
     web_contents_->HideContents();
 }
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, aura::client::DragDropDelegate implementation:
 
 void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
   if (drag_dest_delegate_)
     drag_dest_delegate_->DragInitialize(web_contents_);
 
-  WebDropData drop_data;
-  PrepareWebDropData(&drop_data, event.data());
+  current_incoming_drop_data_.reset(new WebDropData());
+  PrepareWebDropData(current_incoming_drop_data_.get(), event.data());
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
   gfx::Point screen_pt =
       GetNativeView()->GetRootWindow()->last_mouse_location();
   web_contents_->GetRenderViewHost()->DragTargetDragEnter(
-      drop_data, event.location(), screen_pt, op);
+      *current_incoming_drop_data_, event.location(), screen_pt, op);
 
   if (drag_dest_delegate_) {
     drag_dest_delegate_->OnReceiveDragData(event.data());
     drag_dest_delegate_->OnDragEnter();
   }
 }
 
 int WebContentsViewAura::OnDragUpdated(const aura::DropTargetEvent& event) {
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
   gfx::Point screen_pt =
       GetNativeView()->GetRootWindow()->last_mouse_location();
   web_contents_->GetRenderViewHost()->DragTargetDragOver(
       event.location(), screen_pt, op);
 
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDragOver();
 
   return ConvertFromWeb(current_drag_op_);
 }
 
 void WebContentsViewAura::OnDragExited() {
   web_contents_->GetRenderViewHost()->DragTargetDragLeave();
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDragLeave();
+  current_incoming_drop_data_.reset();
 }
 
 int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       GetNativeView()->GetRootWindow()->last_mouse_location());
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
+  current_incoming_drop_data_.reset();
   return current_drag_op_;
 }