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

Unified Diff: ui/views/controls/textfield/textfield.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: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index a1759901e6b01629360e529a462a91244c9503d2..8ca83cb0e93501fcd2275f9da6b61e02465dce3e 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -990,7 +990,6 @@ void Textfield::WriteDragDataForView(View* sender,
const gfx::Point& press_pt,
OSExchangeData* data) {
const base::string16& selected_text(GetSelectedText());
- data->SetString(selected_text);
Label label(selected_text, GetFontList());
label.SetBackgroundColor(GetBackgroundColor());
label.set_subpixel_rendering_enabled(false);
@@ -1012,6 +1011,11 @@ void Textfield::WriteDragDataForView(View* sender,
drag_utils::SetDragImageOnDataObject(*canvas, kOffset, data);
if (controller_)
controller_->OnWriteDragData(data);
+
+ // Set the string to |selected_text| if a string was not set by
+ // |controller_|.
+ if (!data->HasString())
+ data->SetString(selected_text);
}
int Textfield::GetDragOperationsForView(View* sender, const gfx::Point& p) {

Powered by Google App Engine
This is Rietveld 408576698