Omnibox should accept and navigate URLs dropped using drag and drop.

BUG=157690


Review URL: https://chromiumcodereview.appspot.com/11416327

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171125 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -779,6 +779,27 @@ void OmniboxViewViews::OnWriteDragData(ui::OSExchangeData* data) {
     data->SetURL(url, selected_text);
 }
 
+void OmniboxViewViews::AppendDropFormats(
+    int* formats,
+    std::set<ui::OSExchangeData::CustomFormat>* custom_formats) {
+  *formats = *formats | ui::OSExchangeData::URL;
+}
+
+int OmniboxViewViews::OnDrop(const ui::OSExchangeData& data) {
+  if (data.HasURL()) {
+    GURL url;
+    string16 title;
+    if (data.GetURLAndTitle(&url, &title)) {
+      string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
+      if (model()->CanPasteAndGo(text)) {
+        model()->PasteAndGo(text);
+        return ui::DragDropTypes::DRAG_COPY;
+      }
+    }
+  }
+  return ui::DragDropTypes::DRAG_NONE;
+}
+
 void OmniboxViewViews::UpdateContextMenu(ui::SimpleMenuModel* menu_contents) {
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend

chrome/browser/ui/views/omnibox/omnibox_view_views.h

@@ -140,6 +140,10 @@ class OmniboxViewViews
   virtual void OnAfterUserAction(views::Textfield* sender) OVERRIDE;
   virtual void OnAfterCutOrCopy() OVERRIDE;
   virtual void OnWriteDragData(ui::OSExchangeData* data) OVERRIDE;
+  virtual void AppendDropFormats(
+      int* formats,
+      std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual int OnDrop(const ui::OSExchangeData& data) OVERRIDE;
   virtual void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;

ui/views/controls/textfield/native_textfield_views.cc

@@ -196,11 +196,18 @@ bool NativeTextfieldViews::GetDropFormats(
     return false;
   // TODO(msw): Can we support URL, FILENAME, etc.?
   *formats = ui::OSExchangeData::STRING;
+  TextfieldController* controller = textfield_->GetController();
+  if (controller)
+    controller->AppendDropFormats(formats, custom_formats);
   return true;
 }
 
 bool NativeTextfieldViews::CanDrop(const OSExchangeData& data) {
-  return textfield_->enabled() && !textfield_->read_only() && data.HasString();
+  int formats;
+  std::set<OSExchangeData::CustomFormat> custom_formats;
+  GetDropFormats(&formats, &custom_formats);
+  return textfield_->enabled() && !textfield_->read_only() &&
+      data.HasAnyFormat(formats, custom_formats);
 }
 
 int NativeTextfieldViews::OnDragUpdated(const ui::DropTargetEvent& event) {
@@ -222,6 +229,14 @@ int NativeTextfieldViews::OnDragUpdated(const ui::DropTargetEvent& event) {
 
 int NativeTextfieldViews::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(CanDrop(event.data()));
+
+  TextfieldController* controller = textfield_->GetController();
+  if (controller) {
+      int drag_operation = controller->OnDrop(event.data());
+      if (drag_operation != ui::DragDropTypes::DRAG_NONE)
+        return drag_operation;
+  }
+
   DCHECK(!initiating_drag_ ||
          !GetRenderText()->IsPointInSelection(event.location()));
   OnBeforeUserAction();

ui/views/controls/textfield/textfield_controller.cc

@@ -4,8 +4,14 @@
 
 #include "ui/views/controls/textfield/textfield_controller.h"
 
+#include "ui/base/dragdrop/drag_drop_types.h"
+
 namespace views {
 
+int TextfieldController::OnDrop(const ui::OSExchangeData& data) {
+  return ui::DragDropTypes::DRAG_NONE;
+}
+
 bool TextfieldController::IsCommandIdEnabled(int command_id) const {
   return false;
 }

ui/views/controls/textfield/textfield_controller.h

@@ -5,12 +5,14 @@
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
 
+#include <set>
+
 #include "base/string16.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/views/views_export.h"
 
 namespace ui {
 class KeyEvent;
-class OSExchangeData;
 class SimpleMenuModel;
 }  // namespace ui
 
@@ -49,6 +51,17 @@ class VIEWS_EXPORT TextfieldController {
   // chance to modify the drag data.
   virtual void OnWriteDragData(ui::OSExchangeData* data) {}
 
+  // Enables the controller to append to the accepted drop formats.
+  virtual void AppendDropFormats(
+      int* formats,
+      std::set<ui::OSExchangeData::CustomFormat>* custom_formats) {}
+
+  // Called when a drop of dragged data happens on the textfield. This method is
+  // called before regular handling of the drop. If this returns a drag
+  // operation other than |ui::DragDropTypes::DRAG_NONE|, regular handling is
+  // skipped.
+  virtual int OnDrop(const ui::OSExchangeData& data);
+
   // Gives the controller a chance to modify the context menu contents.
   virtual void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) {}