diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
| commit | dd131d3723dee3050b746319e437514d8fdb6bb1 (patch) | |
| tree | c44435187d6d4df51dcf5e02b31be151de270390 /ui/views/touchui/touch_selection_controller_impl_unittest.cc | |
| parent | 2c6e3b04ca361d052f1e8fdc70983bcc7c379dba (diff) | |
| download | chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.zip chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.gz chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.bz2 | |
Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."
> Cleanups for aura/test/event_generator.h (resolve TODOs)
>
> Some purely mechanical changes left over from r283694, now that
> aura::test::EventGenerator has moved to ui::test in src/ui/events.
>
> Moves aura/test/event_generator.* to event_generator_delegate_aura.*
> Removes `using ui::test::EventGenerator;` declaration and redirects
> includes that don't extend the delegate to include the ui/test
> event_generator.h directly
>
> BUG=378134
>
> Review URL: https://codereview.chromium.org/406413004
TBR=tapted@chromium.org
Review URL: https://codereview.chromium.org/413983006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285222 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 73cf4f0..0af64c3 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -6,11 +6,11 @@ #include "base/strings/utf_string_conversions.h" #include "grit/ui_resources.h" #include "ui/aura/client/screen_position_client.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" -#include "ui/events/test/event_generator.h" #include "ui/gfx/canvas.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" @@ -543,7 +543,7 @@ TEST_F(TouchSelectionControllerImplTest, DoubleTapInTextfieldWithCursorHandleShouldSelectText) { CreateTextfield(); textfield_->SetText(ASCIIToUTF16("some text")); - ui::test::EventGenerator generator( + aura::test::EventGenerator generator( textfield_->GetWidget()->GetNativeView()->GetRootWindow()); // Tap the textfield to invoke touch selection. @@ -804,7 +804,7 @@ TEST_F(TouchSelectionControllerImplTest, MouseEventDeactivatesTouchSelection) { CreateTextfield(); EXPECT_FALSE(GetSelectionController()); - ui::test::EventGenerator generator( + aura::test::EventGenerator generator( textfield_widget_->GetNativeView()->GetRootWindow()); generator.set_current_location(gfx::Point(5, 5)); @@ -845,7 +845,7 @@ TEST_F(TouchSelectionControllerImplTest, KeyEventDeactivatesTouchSelection) { CreateTextfield(); EXPECT_FALSE(GetSelectionController()); - ui::test::EventGenerator generator( + aura::test::EventGenerator generator( textfield_widget_->GetNativeView()->GetRootWindow()); RunPendingMessages(); |