Move the core drag&drop code for Windows to content\browser to match Mac/GTK. I've had to add tempo…

chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.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 "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h"
 
-#include "chrome/browser/tab_contents/web_drop_target_win.h"
+#include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h"
+#include "content/browser/tab_contents/web_drag_dest_win.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace {
@@ skipping 71 matching lines @@
 
 void NativeTabContentsViewWin::InitNativeTabContentsView() {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.native_widget = this;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = HiddenTabHostWindow::Instance();
   GetWidget()->Init(params);
 
   // Remove the root view drop target so we can register our own.
   RevokeDragDrop(GetNativeView());
-  drop_target_ = new WebDropTarget(GetNativeView(),
-                                   delegate_->GetWebContents());
+  drag_dest_ = new WebDragDest(GetNativeView(), delegate_->GetWebContents());
+  bookmark_handler_.reset(new WebDragBookmarkHandlerWin());
+  drag_dest_->set_delegate(bookmark_handler_.get());
 }
 
 void NativeTabContentsViewWin::Unparent() {
   // Note that we do not DCHECK on focus_manager_ as it may be NULL when used
   // with an external tab container.
   views::Widget::ReparentNativeView(GetNativeView(),
                                     HiddenTabHostWindow::Instance());
 }
 
 RenderWidgetHostView* NativeTabContentsViewWin::CreateRenderWidgetHostView(
@@ skipping 27 matching lines @@
 void NativeTabContentsViewWin::CancelDrag() {
   drag_handler_->CancelDrag();
 }
 
 bool NativeTabContentsViewWin::IsDoingDrag() const {
   return drag_handler_.get() != NULL;
 }
 
 void NativeTabContentsViewWin::SetDragCursor(
     WebKit::WebDragOperation operation) {
-  drop_target_->set_drag_cursor(operation);
+  drag_dest_->set_drag_cursor(operation);
 }
 
 views::NativeWidget* NativeTabContentsViewWin::AsNativeWidget() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsViewWin, views::NativeWidgetWin overrides:
 
 void NativeTabContentsViewWin::OnDestroy() {
-  if (drop_target_.get()) {
+  if (drag_dest_.get()) {
     RevokeDragDrop(GetNativeView());
-    drop_target_ = NULL;
+    drag_dest_ = NULL;
   }
 
   NativeWidgetWin::OnDestroy();
 }
 
 void NativeTabContentsViewWin::OnHScroll(int scroll_type,
                                          short position,
                                          HWND scrollbar) {
   ScrollCommon(WM_HSCROLL, scroll_type, position, scrollbar);
 }
@@ skipping 163 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsView, public:
 
 // static
 NativeTabContentsView* NativeTabContentsView::CreateNativeTabContentsView(
     internal::NativeTabContentsViewDelegate* delegate) {
   return new NativeTabContentsViewWin(delegate);
 }