Fixed drag and drop into and out of Browser Plugin.

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/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
@@ skipping 273 matching lines @@
       case ui::ET_MOUSE_DRAGGED:
         rvh = contents_->GetRenderViewHost();
         if (rvh) {
           gfx::Point screen_loc_in_pixel = ui::EventLocationFromNative(event);
           gfx::Point screen_loc = ConvertPointToDIP(rvh->GetView(),
               screen_loc_in_pixel);
           gfx::Point client_loc = screen_loc;
           aura::Window* window = rvh->GetView()->GetNativeView();
           aura::Window::ConvertPointToTarget(window->GetRootWindow(),
               window, &client_loc);
-          rvh->DragSourceMovedTo(client_loc.x(), client_loc.y(),
+          contents_->DragSourceMovedTo(client_loc.x(), client_loc.y(),
               screen_loc.x(), screen_loc.y());
         }
         break;
       default:
         break;
     }
   }
 
   virtual void Observe(int type,
       const NotificationSource& source,
@@ skipping 590 matching lines @@
 }
 
 void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
   gfx::Point screen_loc =
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
   gfx::Point client_loc = screen_loc;
   RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   aura::Window* window = rvh->GetView()->GetNativeView();
   aura::Window::ConvertPointToTarget(root_window, window, &client_loc);
-  rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),
-      screen_loc.y(), ops);
+  web_contents_->DragSourceEndedAt(client_loc.x(), client_loc.y(),
+      screen_loc.x(), screen_loc.y(), ops);
 }
 
 void WebContentsViewAura::PrepareOverscrollWindow() {
   // If there is an existing |overscroll_window_| which is in the middle of an
   // animation, then destroying the window here causes the animation to be
   // completed immidiately, which triggers |OnImplicitAnimationsCompleted()|
   // callback, and that tries to reset |overscroll_window_| again, causing a
   // double-free. So use a temporary variable here.
   if (overscroll_window_.get()) {
     base::AutoReset<OverscrollMode> reset_state(&current_overscroll_gesture_,
@@ skipping 433 matching lines @@
 
   // Bail out immediately if the contents view window is gone. Note that it is
   // not safe to access any class members after system drag-and-drop returns
   // since the class instance might be gone. The local variable |drag_source|
   // is still valid and we can check its window property that is set to NULL
   // when the contents are gone.
   if (!drag_source->window())
     return;
 
   EndDrag(ConvertToWeb(result_op));
-  web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();
+  web_contents_->SystemDragEnded();
 }
 
 void WebContentsViewAura::UpdateDragCursor(WebKit::WebDragOperation operation) {
   current_drag_op_ = operation;
 }
 
 void WebContentsViewAura::GotFocus() {
   if (web_contents_->GetDelegate())
     web_contents_->GetDelegate()->WebContentsFocused(web_contents_);
 }
@@ skipping 273 matching lines @@
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return current_drag_op_;
 }
 
 }  // namespace content