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

content/browser/tab_contents/web_drag_dest_win.cc

 // Copyright (c) 2011 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/tab_contents/web_drop_target_win.h"
+#include "content/browser/tab_contents/web_drag_dest_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
-#include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h"
-#include "chrome/browser/tab_contents/web_drag_utils_win.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/web_drag_dest_delegate.h"
+#include "content/browser/tab_contents/web_drag_utils_win.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/window_open_disposition.h"
 
@@ skipping 15 matching lines @@
   if (effect & DROPEFFECT_LINK)
     return DROPEFFECT_LINK;
   if (effect & DROPEFFECT_MOVE)
     return DROPEFFECT_MOVE;
   return DROPEFFECT_NONE;
 }
 
 }  // namespace
 
 // InterstitialDropTarget is like a ui::DropTarget implementation that
-// WebDropTarget passes through to if an interstitial is showing.  Rather than
+// WebDragDest passes through to if an interstitial is showing.  Rather than
 // passing messages on to the renderer, we just check to see if there's a link
 // in the drop data and handle links as navigations.
 class InterstitialDropTarget {
  public:
   explicit InterstitialDropTarget(WebContents* web_contents)
       : web_contents_(web_contents) {}
 
   DWORD OnDragEnter(IDataObject* data_object, DWORD effect) {
     return ui::ClipboardUtil::HasUrl(data_object) ?
         GetPreferredDropEffect(effect) : DROPEFFECT_NONE;
@@ skipping 20 matching lines @@
     web_contents_->OpenURL(params);
     return GetPreferredDropEffect(effect);
   }
 
  private:
   WebContents* web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialDropTarget);
 };
 
-WebDropTarget::WebDropTarget(HWND source_hwnd, WebContents* web_contents)
+WebDragDest::WebDragDest(HWND source_hwnd, WebContents* web_contents)
     : ui::DropTarget(source_hwnd),
       web_contents_(web_contents),
       current_rvh_(NULL),
       drag_cursor_(WebDragOperationNone),
       interstitial_drop_target_(new InterstitialDropTarget(web_contents)),
-      delegate_(new WebDragBookmarkHandlerWin()) {
+      delegate_(NULL) {
 }
 
-WebDropTarget::~WebDropTarget() {
-  // TODO(jam): this will be owned by chrome when it moves, so no scoped
-  // pointer.
-  if (delegate_)
-    delete delegate_;
+WebDragDest::~WebDragDest() {
 }
 
-DWORD WebDropTarget::OnDragEnter(IDataObject* data_object,
-                                 DWORD key_state,
-                                 POINT cursor_position,
-                                 DWORD effects) {
+DWORD WebDragDest::OnDragEnter(IDataObject* data_object,
+                               DWORD key_state,
+                               POINT cursor_position,
+                               DWORD effects) {
   current_rvh_ = web_contents_->GetRenderViewHost();
 
   if (delegate_)
     delegate_->DragInitialize(web_contents_);
 
   // Don't pass messages to the renderer if an interstitial page is showing
   // because we don't want the interstitial page to navigate.  Instead,
   // pass the messages on to a separate interstitial DropTarget handler.
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDragEnter(data_object, effects);
@@ skipping 16 matching lines @@
       web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects));
 
   if (delegate_)
       delegate_->OnDragEnter(data_object);
 
   // We lie here and always return a DROPEFFECT because we don't want to
   // wait for the IPC call to return.
   return web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
 }
 
-DWORD WebDropTarget::OnDragOver(IDataObject* data_object,
-                                DWORD key_state,
-                                POINT cursor_position,
-                                DWORD effects) {
+DWORD WebDragDest::OnDragOver(IDataObject* data_object,
+                              DWORD key_state,
+                              POINT cursor_position,
+                              DWORD effects) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     OnDragEnter(data_object, key_state, cursor_position, effects);
 
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDragOver(data_object, effects);
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
   web_contents_->GetRenderViewHost()->DragTargetDragOver(
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y),
       web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects));
 
   if (delegate_)
     delegate_->OnDragOver(data_object);
 
   return web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
 }
 
-void WebDropTarget::OnDragLeave(IDataObject* data_object) {
+void WebDragDest::OnDragLeave(IDataObject* data_object) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     return;
 
   if (web_contents_->ShowingInterstitialPage()) {
     interstitial_drop_target_->OnDragLeave(data_object);
   } else {
     web_contents_->GetRenderViewHost()->DragTargetDragLeave();
   }
 
   if (delegate_)
     delegate_->OnDragLeave(data_object);
 }
 
-DWORD WebDropTarget::OnDrop(IDataObject* data_object,
-                            DWORD key_state,
-                            POINT cursor_position,
-                            DWORD effect) {
+DWORD WebDragDest::OnDrop(IDataObject* data_object,
+                          DWORD key_state,
+                          POINT cursor_position,
+                          DWORD effect) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     OnDragEnter(data_object, key_state, cursor_position, effect);
 
   if (web_contents_->ShowingInterstitialPage())
     interstitial_drop_target_->OnDragOver(data_object, effect);
 
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDrop(data_object, effect);
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y));
 
   if (delegate_)
     delegate_->OnDrop(data_object);
 
   current_rvh_ = NULL;
 
   // This isn't always correct, but at least it's a close approximation.
   // For now, we always map a move to a copy to prevent potential data loss.
   DWORD drop_effect = web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
   return drop_effect != DROPEFFECT_MOVE ? drop_effect : DROPEFFECT_COPY;
 }