Fix HTML5 effectAllowed and dragEffect on Chrome Linux.

chrome/browser/tab_contents/web_drag_dest_gtk.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/tab_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "net/base/net_util.h"
 
 using WebKit::WebDragOperation;
+using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationCopy;
+using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
-using WebKit::WebDragOperationNone;
+
+namespace {
+
+WebDragOperation GdkDragActionToWebDragOp(GdkDragAction action) {
+  WebDragOperation op = WebDragOperationNone;
+  if (action & GDK_ACTION_COPY)
+    op = static_cast<WebDragOperation>(op | WebDragOperationCopy);
+  if (action & GDK_ACTION_LINK)
+    op = static_cast<WebDragOperation>(op | WebDragOperationLink);
+  if (action & GDK_ACTION_MOVE)
+    op = static_cast<WebDragOperation>(op | WebDragOperationMove);
+  return op;
+}
+
+}  // namespace
 
 WebDragDestGtk::WebDragDestGtk(TabContents* tab_contents, GtkWidget* widget)
     : tab_contents_(tab_contents),
       widget_(widget),
       context_(NULL),
       method_factory_(this) {
   gtk_drag_dest_set(widget, static_cast<GtkDestDefaults>(0),
-                    NULL, 0, GDK_ACTION_COPY);
+                    NULL, 0,
+                    static_cast<GdkDragAction>(GDK_ACTION_COPY |
+                                               GDK_ACTION_LINK |
+                                               GDK_ACTION_MOVE));
   g_signal_connect(widget, "drag-motion",
                    G_CALLBACK(OnDragMotionThunk), this);
   g_signal_connect(widget, "drag-leave",
                    G_CALLBACK(OnDragLeaveThunk), this);
   g_signal_connect(widget, "drag-drop",
                    G_CALLBACK(OnDragDropThunk), this);
   g_signal_connect(widget, "drag-data-received",
                    G_CALLBACK(OnDragDataReceivedThunk), this);
+  // TODO(tony): Need a drag-data-delete handler for moving content out of
+  // the tab contents.  http://crbug.com/38989
 
   destroy_handler_ = g_signal_connect(
       widget, "destroy", G_CALLBACK(gtk_widget_destroyed), &widget_);
 }
 
 WebDragDestGtk::~WebDragDestGtk() {
   if (widget_) {
     gtk_drag_dest_unset(widget_);
     g_signal_handler_disconnect(widget_, destroy_handler_);
   }
 }
 
 void WebDragDestGtk::UpdateDragStatus(WebDragOperation operation) {
   if (context_) {
-    // TODO(estade): we might want to support other actions besides copy,
-    // but that would increase the cost of getting our drag success guess
-    // wrong.
     is_drop_target_ = operation != WebDragOperationNone;
-    gdk_drag_status(context_, is_drop_target_ ? GDK_ACTION_COPY :
-                    static_cast<GdkDragAction>(0),
+    gdk_drag_status(context_, gtk_dnd_util::WebDragOpToGdkDragAction(operation),
                     drag_over_time_);
   }
 }
 
 void WebDragDestGtk::DragLeave() {
   tab_contents_->render_view_host()->DragTargetDragLeave();
 
   if (tab_contents_->GetBookmarkDragDelegate()) {
     tab_contents_->GetBookmarkDragDelegate()->OnDragLeave(bookmark_drag_data_);
   }
@@ skipping 22 matching lines @@
     for (size_t i = 0; i < arraysize(supported_targets); ++i) {
       gtk_drag_get_data(widget_, context,
                         gtk_dnd_util::GetAtomForTarget(supported_targets[i]),
                         time);
     }
   } else if (data_requests_ == 0) {
     // TODO(snej): Pass appropriate DragOperation instead of hardcoding
     tab_contents_->render_view_host()->
         DragTargetDragOver(gtk_util::ClientPoint(widget_),
                            gtk_util::ScreenPoint(widget_),
-                           static_cast<WebDragOperation>(
-                               WebDragOperationCopy | WebDragOperationMove));
+                           GdkDragActionToWebDragOp(context->actions));
     if (tab_contents_->GetBookmarkDragDelegate())
       tab_contents_->GetBookmarkDragDelegate()->OnDragOver(bookmark_drag_data_);
     drag_over_time_ = time;
   }
 
   // Pretend we are a drag destination because we don't want to wait for
   // the renderer to tell us if we really are or not.
   return TRUE;
 }
 
@@ skipping 67 matching lines @@
       bookmark_drag_data_.SetOriginatingProfile(tab_contents_->profile());
     }
   }
 
   if (data_requests_ == 0) {
     // Tell the renderer about the drag.
     // |x| and |y| are seemingly arbitrary at this point.
     // TODO(snej): Pass appropriate DragOperation instead of hardcoding.
     tab_contents_->render_view_host()->
         DragTargetDragEnter(*drop_data_.get(),
-                            gtk_util::ClientPoint(widget_),
-                            gtk_util::ScreenPoint(widget_),
-                            static_cast<WebDragOperation>(
-                                WebDragOperationCopy | WebDragOperationMove));
+            gtk_util::ClientPoint(widget_),
+            gtk_util::ScreenPoint(widget_),
+            GdkDragActionToWebDragOp(context->actions));
 
     // This is non-null if tab_contents_ is showing an ExtensionDOMUI with
     // support for (at the moment experimental) drag and drop extensions.
     if (tab_contents_->GetBookmarkDragDelegate()) {
       tab_contents_->GetBookmarkDragDelegate()->OnDragEnter(
           bookmark_drag_data_);
     }
 
     drag_over_time_ = time;
   }
@@ skipping 22 matching lines @@
 
   tab_contents_->render_view_host()->
       DragTargetDrop(gtk_util::ClientPoint(widget_),
                      gtk_util::ScreenPoint(widget_));
 
   // This is non-null if tab_contents_ is showing an ExtensionDOMUI with
   // support for (at the moment experimental) drag and drop extensions.
   if (tab_contents_->GetBookmarkDragDelegate())
     tab_contents_->GetBookmarkDragDelegate()->OnDrop(bookmark_drag_data_);
 
-  // The second parameter is just an educated guess, but at least we will
-  // get the drag-end animation right sometimes.
+  // The second parameter is just an educated guess as to whether or not the
+  // drag succeeded, but at least we will get the drag-end animation right
+  // sometimes.
   gtk_drag_finish(context, is_drop_target_, FALSE, time);
   return TRUE;
 }