Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8337)

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 208313009: Fix the HTML5 drag and drop demos on Linux and CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 538d386de3322ea57b9ef5a4efb83bd48ab7abf8..e8431a74050093258506423526f96565ee49a583 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -937,7 +937,6 @@ void OmniboxViewViews::OnWriteDragData(ui::OSExchangeData* data) {
base::string16 selected_text = GetSelectedText();
model()->AdjustTextForCopy(GetSelectedRange().GetMin(), is_all_selected,
&selected_text, &url, &write_url);
- data->SetString(selected_text);
if (write_url) {
gfx::Image favicon;
base::string16 title = selected_text;
@@ -946,6 +945,8 @@ void OmniboxViewViews::OnWriteDragData(ui::OSExchangeData* data) {
button_drag_utils::SetURLAndDragImage(url, title, favicon.AsImageSkia(),
NULL, data, GetWidget());
data->SetURL(url, title);
+ } else {
+ data->SetString(selected_text);
sky 2014/07/09 20:39:08 Why don't we always want to set the string content
pkotwicz 2014/07/09 23:00:18 The string content is set by the first caller of O
sky 2014/07/10 16:13:03 Was this always the case? I wonder if SetURL shoul
}
}

Powered by Google App Engine
This is Rietveld 408576698