Fix Bookmark manager DnD: WebDragDestinationDelegate was getting recreated with

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 180 matching lines @@
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
   gfx::Point screen_loc = root_window->last_mouse_location();
   gfx::Point client_loc = screen_loc;
   content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   aura::Window* window = rvh->GetView()->GetNativeView();
   aura::Window::ConvertPointToWindow(root_window, window, &client_loc);
   rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),
       screen_loc.y(), ops);
 }
 
-content::WebDragDestDelegate* WebContentsViewAura::GetDragDestDelegate() {
-  return delegate_.get() ? delegate_->GetDragDestDelegate() : NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, WebContentsView implementation:
 
 void WebContentsViewAura::CreateView(const gfx::Size& initial_size) {
   initial_size_ = initial_size;
 
   window_.reset(new aura::Window(this));
   window_->set_owned_by_parent(false);
   window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
   window_->SetTransparent(false);
   window_->Init(ui::LAYER_NOT_DRAWN);
 #if defined(USE_ASH)
   window_->SetParent(NULL);
 #endif
   window_->layer()->SetMasksToBounds(true);
   window_->SetName("WebContentsViewAura");
+  if (delegate_.get())

[sky, 2012/05/01 17:33:51]

Add a comment as to why you're doing this. Also, you're not initializing it and
it doesn't seem that you ever reset it (I assume you need an else case that sets
it to NULL).

[varunjain, 2012/05/01 17:56:35]

added comment and initialized to NULL

+    drag_dest_delegate_ = delegate_->GetDragDestDelegate();
 }
 
 content::RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget(
     content::RenderWidgetHost* render_widget_host) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
@@ skipping 212 matching lines @@
     // always start from a mouse-event (e.g. a touch or gesture event could
     // initiate the drag). The location information should be carried over from
     // webkit. http://crbug.com/114754
     gfx::Point location(root_window->last_mouse_location());
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
     result_op = aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, location, ConvertFromWeb(operations));
   }
 
   EndDrag(ConvertToWeb(result_op));
-  web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();}
+  web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();
+}
 
 void WebContentsViewAura::UpdateDragCursor(WebKit::WebDragOperation operation) {
   current_drag_op_ = operation;
 }
 
 void WebContentsViewAura::GotFocus() {
   if (web_contents_->GetDelegate())
     web_contents_->GetDelegate()->WebContentsFocused(web_contents_);
 }
 
@@ skipping 83 matching lines @@
 void WebContentsViewAura::OnWindowVisibilityChanged(bool visible) {
   if (visible)
     web_contents_->ShowContents();
   else
     web_contents_->HideContents();
 }
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, aura::client::DragDropDelegate implementation:
 
 void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
-  if (GetDragDestDelegate())
-    GetDragDestDelegate()->DragInitialize(web_contents_);
+  if (drag_dest_delegate_)
+    drag_dest_delegate_->DragInitialize(web_contents_);
 
   WebDropData drop_data;
   PrepareWebDropData(&drop_data, 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);
 
-  if (GetDragDestDelegate()) {
-    GetDragDestDelegate()->OnReceiveDragData(event.data());
-    GetDragDestDelegate()->OnDragEnter();
+  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 (GetDragDestDelegate())
-    GetDragDestDelegate()->OnDragOver();
+  if (drag_dest_delegate_)
+    drag_dest_delegate_->OnDragOver();
 
   return ConvertFromWeb(current_drag_op_);
 }
 
 void WebContentsViewAura::OnDragExited() {
   web_contents_->GetRenderViewHost()->DragTargetDragLeave();
-  if (GetDragDestDelegate())
-    GetDragDestDelegate()->OnDragLeave();
+  if (drag_dest_delegate_)
+    drag_dest_delegate_->OnDragLeave();
 }
 
 int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       GetNativeView()->GetRootWindow()->last_mouse_location());
-  if (GetDragDestDelegate())
-    GetDragDestDelegate()->OnDrop();
+  if (drag_dest_delegate_)
+    drag_dest_delegate_->OnDrop();
   return current_drag_op_;
 }