diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 12:34:13 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 12:34:13 +0000 |
| commit | b89622c6a71c0244d753ac9d87171a99805fab64 (patch) | |
| tree | 55c1c9a4be4576e784026daa1113b8cabba222bb /ui/chromeos/touch_exploration_controller_unittest.cc | |
| parent | eb7c76762cfe5bd310de84468924dcd97a8ec2d5 (diff) | |
| download | chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.zip chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.tar.gz chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/chromeos/touch_exploration_controller_unittest.cc')
| -rw-r--r-- | ui/chromeos/touch_exploration_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc index b00814b..1f1155f 100644 --- a/ui/chromeos/touch_exploration_controller_unittest.cc +++ b/ui/chromeos/touch_exploration_controller_unittest.cc @@ -8,12 +8,12 @@ #include "base/time/time.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/test/aura_test_base.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_cursor_client.h" #include "ui/aura/window.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/events/gestures/gesture_provider_aura.h" +#include "ui/events/test/event_generator.h" #include "ui/events/test/events_test_utils.h" #include "ui/gfx/geometry/point.h" #include "ui/gl/gl_implementation.h" @@ -171,7 +171,7 @@ class TouchExplorationTest : public aura::test::AuraTestBase { aura::test::AuraTestBase::SetUp(); cursor_client_.reset(new aura::test::TestCursorClient(root_window())); root_window()->AddPreTargetHandler(&event_capturer_); - generator_.reset(new aura::test::EventGenerator(root_window())); + generator_.reset(new test::EventGenerator(root_window())); // The generator takes ownership of the clock. generator_->SetTickClock(scoped_ptr<base::TickClock>(simulated_clock_)); cursor_client()->ShowCursor(); @@ -315,7 +315,7 @@ class TouchExplorationTest : public aura::test::AuraTestBase { simulated_clock_->NowTicks().ToInternalValue()); } - scoped_ptr<aura::test::EventGenerator> generator_; + scoped_ptr<test::EventGenerator> generator_; ui::GestureDetector::Config gesture_detector_config_; // Owned by |generator_|. base::SimpleTestTickClock* simulated_clock_; |