summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_drag_win.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
index e9c7d5f..51d8f3a 100644
--- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc
@@ -286,10 +286,12 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data,
PrepareDragForFileContents(drop_data, &data);
if (!drop_data.text_html.empty())
data.SetHtml(drop_data.text_html, drop_data.html_base_url);
- if (drop_data.url.is_valid())
- PrepareDragForUrl(drop_data, &data);
+ // We set the text contents before the URL because the URL also sets text
+ // content.
if (!drop_data.plain_text.empty())
data.SetString(drop_data.plain_text);
+ if (drop_data.url.is_valid())
+ PrepareDragForUrl(drop_data, &data);
}
// Set drag image.