diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 18:12:09 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 18:12:09 +0000 |
| commit | de732e80cd8e36d347c473b07a32f4950b0eaa57 (patch) | |
| tree | 997023c3d96a4ec48b10e87340d92000a5c0f2e6 /ui/views/touchui/touch_selection_controller_impl_unittest.cc | |
| parent | f6941903fe7dd1bba50d65f77514d33982b33b57 (diff) | |
| download | chromium_src-de732e80cd8e36d347c473b07a32f4950b0eaa57.zip chromium_src-de732e80cd8e36d347c473b07a32f4950b0eaa57.tar.gz chromium_src-de732e80cd8e36d347c473b07a32f4950b0eaa57.tar.bz2 | |
Nukes USE_AURA ifdefs from views
No longer needed.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/191723003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/touchui/touch_selection_controller_impl_unittest.cc')
| -rw-r--r-- | ui/views/touchui/touch_selection_controller_impl_unittest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 729e20f..d572052 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -5,6 +5,8 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "grit/ui_resources.h" +#include "ui/aura/test/event_generator.h" +#include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/touch/touch_editing_controller.h" #include "ui/base/ui_base_switches.h" @@ -17,11 +19,6 @@ #include "ui/views/touchui/touch_selection_controller_impl.h" #include "ui/views/widget/widget.h" -#if defined(USE_AURA) -#include "ui/aura/test/event_generator.h" -#include "ui/aura/window.h" -#endif - using base::ASCIIToUTF16; using base::UTF16ToUTF8; using base::WideToUTF16; @@ -465,7 +462,6 @@ TEST_F(TouchSelectionControllerImplTest, } } -#if defined(USE_AURA) TEST_F(TouchSelectionControllerImplTest, DoubleTapInTextfieldWithCursorHandleShouldSelectWord) { CreateTextfield(); @@ -490,6 +486,5 @@ TEST_F(TouchSelectionControllerImplTest, EXPECT_TRUE(textfield_->HasSelection()); VERIFY_HANDLE_POSITIONS(false); } -#endif } // namespace views |