Chromium Code Reviews

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.
Jump to:
View side-by-side diff with in-line comments
Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 2dd6fb43b0d5436ee563cf0fd2485a8bdbcbfeb4..1d58ed7161714fd70f278a1db55fc39827392acd 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());
const SkColor background = GetBackgroundColor();
label.SetBackgroundColor(SkColorSetA(background, SK_AlphaTRANSPARENT));
@@ -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