Return an approximately correct drop effect from WebDragTarget::OnDrop.

chrome/browser/views/tab_contents/tab_contents_drag_win.cc

 // Copyright (c) 2009 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/views/tab_contents/tab_contents_drag_win.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/drag_download_file.h"
 #include "chrome/browser/download/drag_download_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/web_drag_source_win.h"
+#include "chrome/browser/tab_contents/web_drag_utils_win.h"
 #include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/views/tab_contents/tab_contents_view_win.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "webkit/glue/webdropdata.h"
 
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
@@ skipping 22 matching lines @@
       // more.
       if (msg->message == WM_LBUTTONUP || !(GetKeyState(VK_LBUTTON) & 0x8000))
         mouse_up_received = true;
 
       return TRUE;
     }
   }
   return CallNextHookEx(msg_hook, code, wparam, lparam);
 }
 
-DWORD WebDragOpToWinDragOp(WebDragOperationsMask op) {
-  DWORD win_op = DROPEFFECT_NONE;
-  if (op & WebDragOperationCopy)
-    win_op |= DROPEFFECT_COPY;
-  if (op & WebDragOperationLink)
-    win_op |= DROPEFFECT_LINK;
-  if (op & WebDragOperationMove)
-    win_op |= DROPEFFECT_MOVE;
-  return win_op;
-}
-
 }  // namespace
 
 class DragDropThread : public base::Thread {
  public:
   explicit DragDropThread(TabContentsDragWin* drag_handler)
        : base::Thread("Chrome_DragDropThread"),
          drag_handler_(drag_handler) {
   }
 
   virtual ~DragDropThread() {
@@ skipping 208 matching lines @@
     if (!drop_data.plain_text.empty())
       data.SetString(drop_data.plain_text);
   }
 
   // We need to enable recursive tasks on the message loop so we can get
   // updates while in the system DoDragDrop loop.
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   DWORD effect;
   MessageLoop::current()->SetNestableTasksAllowed(true);
   DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source_,
-             WebDragOpToWinDragOp(ops), &effect);
+             web_drag_utils_win::WebDragOpToWinDragOp(ops), &effect);
   // This works because WebDragSource::OnDragSourceDrop uses PostTask to
   // dispatch the actual event.
   drag_source_->set_effect(effect);
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void TabContentsDragWin::EndDragging(bool restore_suspended_state) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   if (drag_ended_)
@@ skipping 39 matching lines @@
 
 void TabContentsDragWin::OnDataObjectDisposed() {
   DCHECK(drag_drop_thread_id_ == PlatformThread::CurrentId());
 
   // The drag-and-drop thread is only closed after OLE is done with
   // DataObjectImpl.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &TabContentsDragWin::CloseThread));
 }