summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 20:30:11 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 20:30:11 +0000
commit2a4e56176f21ed9c2a8d53f6fa2b77f8cd789d59 (patch)
tree1d4f7eab471c88492b1612144cf2dca46e8a6ed4 /views/controls/textfield
parent963b13d90a9113c2f6f15043e373ffec9fe713c8 (diff)
downloadchromium_src-2a4e56176f21ed9c2a8d53f6fa2b77f8cd789d59.zip
chromium_src-2a4e56176f21ed9c2a8d53f6fa2b77f8cd789d59.tar.gz
chromium_src-2a4e56176f21ed9c2a8d53f6fa2b77f8cd789d59.tar.bz2
Redo of Issue http://codereview.chromium.org/8621006/
Removed most obvious TOUCH_UI tests. Either obvious because we have USE_AURA | TOUCH_UI or because it is in a GTK module. This CL focuses mainly on Views cleanup. BUG=105046 TEST=none Review URL: http://codereview.chromium.org/8632016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield')
-rw-r--r--views/controls/textfield/native_textfield_views_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 9033f81..7e8b3ef 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -797,7 +797,6 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) {
}
#endif
-#if !defined(TOUCH_UI)
TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_InitiateDrag) {
InitTextfield(Textfield::STYLE_DEFAULT);
textfield_->SetText(ASCIIToUTF16("hello string world"));
@@ -969,7 +968,6 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_Canceled) {
textfield_view_->OnDragDone();
EXPECT_EQ(ASCIIToUTF16("hello world"), textfield_->text());
}
-#endif
TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
InitTextfield(Textfield::STYLE_DEFAULT);