Fix Bookmark manager DnD: WebDragDestinationDelegate was getting recreated with

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 0afbd744a7d4b9fd664297bd23f2f995ab493e23..c7a5cdf34e19b0faf0fa2bb571655d99a4bb3ada 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -198,10 +198,6 @@ void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {
       screen_loc.y(), ops);
 }
 
-content::WebDragDestDelegate* WebContentsViewAura::GetDragDestDelegate() {
-  return delegate_.get() ? delegate_->GetDragDestDelegate() : NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, WebContentsView implementation:
 
@@ -218,6 +214,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size) {
 #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(
@@ -450,7 +448,8 @@ void WebContentsViewAura::StartDragging(
   }
 
   EndDrag(ConvertToWeb(result_op));
-  web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();}
+  web_contents_->GetRenderViewHost()->DragSourceSystemDragEnded();
+}
 
 void WebContentsViewAura::UpdateDragCursor(WebKit::WebDragOperation operation) {
   current_drag_op_ = operation;
@@ -554,8 +553,8 @@ void WebContentsViewAura::OnWindowVisibilityChanged(bool visible) {
 // 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());
@@ -566,9 +565,9 @@ void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
   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();
   }
 }
 
@@ -579,23 +578,23 @@ int WebContentsViewAura::OnDragUpdated(const aura::DropTargetEvent& event) {
   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_;
 }