Plumb the DragOperation through all the layers between the platform DnD code ...

chrome/browser/views/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 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_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/root_view.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webdropdata.h"
 
+using WebKit::WebDragOperation;
+using WebKit::WebDragOperationNone;
+using WebKit::WebDragOperationsMask;
 using WebKit::WebInputEvent;
 
 namespace {
 
 // Windows callback for OnDestroy to detach the plugin windows.
 BOOL CALLBACK DetachPluginWindowsCallback(HWND window, LPARAM param) {
   if (WebPluginDelegateImpl::IsPluginDelegateWindow(window) &&
       !IsHungAppWindow(window)) {
     ::ShowWindow(window, SW_HIDE);
     SetParent(window, NULL);
@@ skipping 80 matching lines @@
 }
 
 gfx::NativeWindow TabContentsViewWin::GetTopLevelNativeWindow() const {
   return ::GetAncestor(GetNativeView(), GA_ROOT);
 }
 
 void TabContentsViewWin::GetContainerBounds(gfx::Rect* out) const {
   GetBounds(out, false);
 }
 
-void TabContentsViewWin::StartDragging(const WebDropData& drop_data) {
+void TabContentsViewWin::StartDragging(const WebDropData& drop_data,
+                                       WebDragOperationsMask ops) {
   OSExchangeData data;
 
   // TODO(tc): Generate an appropriate drag image.
 
   // We set the file contents before the URL because the URL also sets file
   // contents (to a .URL shortcut).  We want to prefer file content data over a
   // shortcut so we add it first.
   if (!drop_data.file_contents.empty()) {
     // Images without ALT text will only have a file extension so we need to
     // synthesize one from the provided extension and URL.
@@ skipping 36 matching lines @@
   drag_source_ = new WebDragSource(GetNativeView(), tab_contents());
 
   DWORD effects;
 
   // 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();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source_,
              DROPEFFECT_COPY | DROPEFFECT_LINK, &effects);
+  // TODO(snej): Use 'ops' param instead of hardcoding dropeffects
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 
   drag_source_ = NULL;
   if (close_tab_after_drag_ends_) {
     close_tab_timer_.Start(base::TimeDelta::FromMilliseconds(0), this,
                            &TabContentsViewWin::CloseTab);
   }
 
   if (tab_contents()->render_view_host())
     tab_contents()->render_view_host()->DragSourceSystemDragEnded();
@@ skipping 149 matching lines @@
 
 void TabContentsViewWin::CancelDragAndCloseTab() {
   DCHECK(IsDoingDrag());
   // We can't close the tab while we're in the drag and
   // |drag_source_->CancelDrag()| is async.  Instead, set a flag to cancel
   // the drag and when the drag nested message loop ends, close the tab.
   drag_source_->CancelDrag();
   close_tab_after_drag_ends_ = true;
 }
 
-void TabContentsViewWin::UpdateDragCursor(bool is_drop_target) {
-  drop_target_->set_is_drop_target(is_drop_target);
+void TabContentsViewWin::UpdateDragCursor(WebDragOperation operation) {
+  drop_target_->set_is_drop_target(operation != WebDragOperationNone);
 }
 
 void TabContentsViewWin::GotFocus() {
   if (tab_contents()->delegate())
     tab_contents()->delegate()->TabContentsFocused(tab_contents());
 }
 
 void TabContentsViewWin::TakeFocus(bool reverse) {
   if (!tab_contents()->delegate()->TakeFocus(reverse)) {
     views::FocusManager* focus_manager =
@@ skipping 300 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }