Makes dragging url from omnibox use same logic as copying from

omnibox.

BUG=44736
TEST=see bug

Review URL: http://codereview.chromium.org/2809030

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

1 files changed, 12 insertions, 6 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 8710100..2795e6e 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -2337,14 +2337,20 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) {
   }
 
   const std::wstring start_text(GetText());
-  if (IsSelectAllForRange(sel)) {
-    // All the text is selected, export as URL.
-    GURL url;
+  std::wstring text_to_write(GetSelectedText());
+  GURL url;
+  bool write_url;
+  const bool is_all_selected = IsSelectAllForRange(sel);
+
+  model()->AdjustTextForCopy(std::min(sel.cpMin, sel.cpMax), is_all_selected,
+                             &text_to_write, &url, &write_url);
+
+  if (write_url) {
     std::wstring title;
     SkBitmap favicon;
-    model_->GetDataForURLExport(&url, &title, &favicon);
+    if (is_all_selected)
+      model_->GetDataForURLExport(&url, &title, &favicon);
     drag_utils::SetURLAndDragImage(url, title, favicon, &data);
-    data.SetURL(url, title);
     supported_modes |= DROPEFFECT_LINK;
     UserMetrics::RecordAction(UserMetricsAction("Omnibox_DragURL"),
                               model_->profile());
@@ -2354,7 +2360,7 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) {
                               model_->profile());
   }
 
-  data.SetString(GetSelectedText());
+  data.SetString(text_to_write);
 
   scoped_refptr<BaseDragSource> drag_source(new BaseDragSource);
   DWORD dropped_mode;