Allow dragging and dropping of URLs to any portion of the toolbar view....

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 22 matching lines @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/drop_target.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/textfield/native_textfield_win.h"
@@ skipping 119 matching lines @@
 }
 
 void EditDropTarget::OnDragLeave(IDataObject* data_object) {
   ResetDropHighlights();
 }
 
 DWORD EditDropTarget::OnDrop(IDataObject* data_object,
                              DWORD key_state,
                              POINT cursor_position,
                              DWORD effect) {
+  effect = OnDragOver(data_object, key_state, cursor_position, effect);
+
   ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
+  views::DropTargetEvent event(os_data, cursor_position.x, cursor_position.y,
+      ui::DragDropTypes::DropEffectToDragOperation(effect));
 
-  if (drag_has_url_) {
-    GURL url;
-    string16 title;
-    if (os_data.GetURLAndTitle(&url, &title)) {
-      edit_->SetUserText(UTF8ToWide(url.spec()));
-      edit_->model()->AcceptInput(CURRENT_TAB, true);
-      return CopyOrLinkDropEffect(effect);
-    }
-  } else if (drag_has_string_) {
-    int string_drop_position = edit_->drop_highlight_position();
-    string16 text;
-    if ((string_drop_position != -1 || !edit_->in_drag()) &&
-        os_data.GetString(&text)) {
-      DCHECK(string_drop_position == -1 ||
-             ((string_drop_position >= 0) &&
-              (string_drop_position <= edit_->GetTextLength())));
-      const DWORD drop_operation =
-          OnDragOver(data_object, key_state, cursor_position, effect);
-      if (edit_->in_drag()) {
-        if (drop_operation == DROPEFFECT_MOVE)
-          edit_->MoveSelectedText(string_drop_position);
-        else
-          edit_->InsertText(string_drop_position, text);
-      } else {
-        edit_->PasteAndGo(CollapseWhitespace(text, true));
-      }
-      ResetDropHighlights();
-      return drop_operation;
-    }
-  }
+  int drag_operation = edit_->OnPerformDrop(event);
 
-  ResetDropHighlights();
+  if (!drag_has_url_)
+    ResetDropHighlights();
 
-  return DROPEFFECT_NONE;
+  return ui::DragDropTypes::DragOperationToDropEffect(drag_operation);
 }
 
 void EditDropTarget::UpdateDropHighlightPosition(
     const POINT& cursor_screen_position) {
   if (drag_has_string_) {
     POINT client_position = cursor_screen_position;
     ScreenToClient(edit_->m_hWnd, &client_position);
     int drop_position = edit_->CharFromPos(client_position);
     if (edit_->in_drag()) {
       // Our edit originated the drag, don't allow a drop if over the selected
@@ skipping 727 matching lines @@
 }
 
 views::View* AutocompleteEditViewWin::AddToView(views::View* parent) {
   views::NativeViewHost* host = new views::NativeViewHost;
   parent->AddChildView(host);
   host->set_focus_view(parent);
   host->Attach(GetNativeView());
   return host;
 }
 
+int AutocompleteEditViewWin::OnPerformDrop(
+    const views::DropTargetEvent& event) {
+  const ui::OSExchangeData& data = event.data();
+
+  if (data.HasURL()) {
+    GURL url;
+    string16 title;
+    if (data.GetURLAndTitle(&url, &title)) {
+      SetUserText(UTF8ToWide(url.spec()));
+      model()->AcceptInput(CURRENT_TAB, true);
+      return event.source_operations();

[sky, 2011/02/11 01:06:07]

I believe you need to return one type here, not all. Same with 969

[Roger Tawa OOO till Jul 10th, 2011/02/11 15:20:17]

At line 183, effect is guaranteed to have only one type.  effect is then used to
build the event object at line 186, which therefore also has only one type.  I
can add a comment to point this out.

[sky, 2011/02/11 17:14:53]

But isn't OnPerformDrop also forwarded from the toolbar, which may have more
types?

[Roger Tawa OOO till Jul 10th, 2011/02/11 21:35:26]

You are correct, I missed that.  Fixed.

+    }
+  } else if (data.HasString()) {
+    int string_drop_position = drop_highlight_position();
+    string16 text;
+    if ((string_drop_position != -1 || !in_drag()) && data.GetString(&text)) {
+      DCHECK(string_drop_position == -1 ||
+             ((string_drop_position >= 0) &&
+              (string_drop_position <= GetTextLength())));
+      if (in_drag()) {
+        if (event.source_operations()== ui::DragDropTypes::DRAG_MOVE)
+          MoveSelectedText(string_drop_position);
+        else
+          InsertText(string_drop_position, text);
+      } else {
+        PasteAndGo(CollapseWhitespace(text, true));
+      }
+      return event.source_operations();
+    }
+  }
+
+  return ui::DragDropTypes::DRAG_NONE;
+}
+
 void AutocompleteEditViewWin::PasteAndGo(const string16& text) {
   if (CanPasteAndGo(text))
     model_->PasteAndGo();
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& e) {
   ui::KeyboardCode key = e.key_code();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
@@ skipping 1607 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool AutocompleteEditViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }