diff options
| author | xji@google.com <xji@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:07:39 +0000 |
|---|---|---|
| committer | xji@google.com <xji@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:07:39 +0000 |
| commit | 9d98523ea91b8ed9c18e05a875aa524ec040438c (patch) | |
| tree | 31b56a2e0899fa0011ed8036c750384e78a9c602 /views/controls/textfield | |
| parent | fe463da73e8a35af033a298fde7aa74923d7c33b (diff) | |
| download | chromium_src-9d98523ea91b8ed9c18e05a875aa524ec040438c.zip chromium_src-9d98523ea91b8ed9c18e05a875aa524ec040438c.tar.gz chromium_src-9d98523ea91b8ed9c18e05a875aa524ec040438c.tar.bz2 | |
Fix touch ui crash in NativeTextfieldViewsTest.DragAndDrop_InitiateDrag.
TEST=compile with touch ui, run NativeTextfieldViewsTest.DragAndDrop_InitiateDrag
Review URL: http://codereview.chromium.org/7721002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield')
| -rw-r--r-- | views/controls/textfield/native_textfield_views.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc index e8fd03d..c509931 100644 --- a/views/controls/textfield/native_textfield_views.cc +++ b/views/controls/textfield/native_textfield_views.cc @@ -311,8 +311,10 @@ void NativeTextfieldViews::ShowContextMenuForView(View* source, void NativeTextfieldViews::WriteDragDataForView(views::View* sender, const gfx::Point& press_pt, OSExchangeData* data) { +#if !defined(TOUCH_UI) DCHECK_NE(ui::DragDropTypes::DRAG_NONE, GetDragOperationsForView(sender, press_pt)); +#endif data->SetString(GetSelectedText()); } |