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

chrome/browser/renderer_host/render_view_host.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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 31 matching lines @@
 #if defined(OS_WIN)
 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #include "chrome/browser/browser_accessibility_manager.h"
 // TODO(port): The compact language detection library works only for Windows.
 #include "third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h"
 #endif
 
 using base::TimeDelta;
 using webkit_glue::PasswordFormDomManager;
 using WebKit::WebConsoleMessage;
+using WebKit::WebDragOperation;
+using WebKit::WebDragOperationNone;
+using WebKit::WebDragOperationsMask;
 using WebKit::WebFindOptions;
 using WebKit::WebInputEvent;
 using WebKit::WebTextDirection;
 
 namespace {
 
 void FilterURL(ChildProcessSecurityPolicy* policy, int renderer_id, GURL* url) {
   if (!url->is_valid())
     return;  // We don't need to block invalid URLs.
 
@@ skipping 391 matching lines @@
 }
 
 void RenderViewHost::FillPasswordForm(
     const PasswordFormDomManager::FillData& form_data) {
   Send(new ViewMsg_FillPasswordForm(routing_id(), form_data));
 }
 
 void RenderViewHost::DragTargetDragEnter(
     const WebDropData& drop_data,
     const gfx::Point& client_pt,
-    const gfx::Point& screen_pt) {
+    const gfx::Point& screen_pt,
+    WebDragOperationsMask operations_allowed) {
   // Grant the renderer the ability to load the drop_data.
   ChildProcessSecurityPolicy* policy =
       ChildProcessSecurityPolicy::GetInstance();
   policy->GrantRequestURL(process()->id(), drop_data.url);
   for (std::vector<string16>::const_iterator iter(drop_data.filenames.begin());
        iter != drop_data.filenames.end(); ++iter) {
     FilePath path = FilePath::FromWStringHack(UTF16ToWideHack(*iter));
     policy->GrantRequestURL(process()->id(),
                             net::FilePathToFileURL(path));
     policy->GrantUploadFile(process()->id(), path);
   }
   Send(new ViewMsg_DragTargetDragEnter(routing_id(), drop_data, client_pt,
-                                       screen_pt));
+                                       screen_pt, operations_allowed));
 }
 
 void RenderViewHost::DragTargetDragOver(
-    const gfx::Point& client_pt, const gfx::Point& screen_pt) {
-  Send(new ViewMsg_DragTargetDragOver(routing_id(), client_pt, screen_pt));
+    const gfx::Point& client_pt, const gfx::Point& screen_pt,
+    WebDragOperationsMask operations_allowed) {
+  Send(new ViewMsg_DragTargetDragOver(routing_id(), client_pt, screen_pt,
+                                      operations_allowed));
 }
 
 void RenderViewHost::DragTargetDragLeave() {
   Send(new ViewMsg_DragTargetDragLeave(routing_id()));
 }
 
 void RenderViewHost::DragTargetDrop(
     const gfx::Point& client_pt, const gfx::Point& screen_pt) {
   Send(new ViewMsg_DragTargetDrop(routing_id(), client_pt, screen_pt));
 }
@@ skipping 109 matching lines @@
   ResetModalDialogEvent();
 
   ViewHostMsg_ShowModalHTMLDialog::WriteReplyParams(reply_msg, json_retval);
   Send(reply_msg);
 }
 
 void RenderViewHost::CopyImageAt(int x, int y) {
   Send(new ViewMsg_CopyImageAt(routing_id(), x, y));
 }
 
-void RenderViewHost::DragSourceCancelledAt(
-    int client_x, int client_y, int screen_x, int screen_y) {
+void RenderViewHost::DragSourceEndedAt(
+    int client_x, int client_y, int screen_x, int screen_y,
+    WebDragOperation operation) {
   Send(new ViewMsg_DragSourceEndedOrMoved(
       routing_id(),
       gfx::Point(client_x, client_y),
       gfx::Point(screen_x, screen_y),
-      true, true));
-}
-
-void RenderViewHost::DragSourceEndedAt(
-    int client_x, int client_y, int screen_x, int screen_y) {
-  Send(new ViewMsg_DragSourceEndedOrMoved(
-      routing_id(),
-      gfx::Point(client_x, client_y),
-      gfx::Point(screen_x, screen_y),
-      true, false));
+      true, operation));
 }
 
 void RenderViewHost::DragSourceMovedTo(
     int client_x, int client_y, int screen_x, int screen_y) {
   Send(new ViewMsg_DragSourceEndedOrMoved(
       routing_id(),
       gfx::Point(client_x, client_y),
       gfx::Point(screen_x, screen_y),
-      false, false));
+      false, WebDragOperationNone));
 }
 
 void RenderViewHost::DragSourceSystemDragEnded() {
   Send(new ViewMsg_DragSourceSystemDragEnded(routing_id()));
 }
 
 void RenderViewHost::AllowBindings(int bindings_flags) {
   DCHECK(!renderer_initialized_);
   enabled_bindings_ |= bindings_flags;
 }
@@ skipping 678 matching lines @@
 
 void RenderViewHost::OnMsgAutofillFormSubmitted(
     const webkit_glue::AutofillForm& form) {
   RenderViewHostDelegate::Autofill* autofill_delegate =
       delegate_->GetAutofillDelegate();
   if (autofill_delegate)
     autofill_delegate->AutofillFormSubmitted(form);
 }
 
 void RenderViewHost::OnMsgStartDragging(
-    const WebDropData& drop_data) {
+    const WebDropData& drop_data,
+    WebDragOperationsMask drag_operations_mask) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
-    view->StartDragging(drop_data);
+      view->StartDragging(drop_data, drag_operations_mask);
 }
 
-void RenderViewHost::OnUpdateDragCursor(bool is_drop_target) {
+void RenderViewHost::OnUpdateDragCursor(WebDragOperation current_op) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
-    view->UpdateDragCursor(is_drop_target);
+    view->UpdateDragCursor(current_op);
 }
 
 void RenderViewHost::OnTakeFocus(bool reverse) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
     view->TakeFocus(reverse);
 }
 
 void RenderViewHost::OnMsgPageHasOSDD(int32 page_id, const GURL& doc_url,
                                       bool autodetected) {
@@ skipping 296 matching lines @@
 }
 
 void RenderViewHost::ResetModalDialogEvent() {
  if (--modal_dialog_count_ == 0)
    modal_dialog_event_->Reset();
 }
 
 void RenderViewHost::UpdateBrowserWindowId(int window_id) {
   Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id));
 }