diff options
Diffstat (limited to 'ui/views/widget')
3 files changed, 7 insertions, 7 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index f52fe91..72bc3fb 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc @@ -8,10 +8,10 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" +#include "ui/events/test/event_generator.h" #include "ui/views/test/views_test_base.h" #include "ui/views/test/widget_test.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc index 0451d78..75a71ac 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc @@ -7,11 +7,11 @@ #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/x/x11_util.h" +#include "ui/events/test/event_generator.h" #include "ui/gfx/display_observer.h" #include "ui/gfx/x/x11_types.h" #include "ui/views/test/views_test_base.h" @@ -290,7 +290,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickHeaderMaximizes) { DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()-> GetAcceleratedWidget()); - aura::test::EventGenerator generator(window); + ui::test::EventGenerator generator(window); generator.ClickLeftButton(); generator.DoubleClickLeftButton(); RunPendingMessages(); @@ -316,7 +316,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) { DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()-> GetAcceleratedWidget()); - aura::test::EventGenerator generator(window); + ui::test::EventGenerator generator(window); native_widget->set_window_component(HTCLIENT); generator.ClickLeftButton(); native_widget->set_window_component(HTCAPTION); @@ -343,7 +343,7 @@ TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) { DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()-> GetAcceleratedWidget())); - aura::test::EventGenerator generator(window); + ui::test::EventGenerator generator(window); native_widget->set_window_component(HTCLIENT); generator.ClickLeftButton(); native_widget->set_window_component(HTCAPTION); diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 9f29b06..b173354 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -11,13 +11,13 @@ #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event_processor.h" +#include "ui/events/test/event_generator.h" #include "ui/gfx/native_widget_types.h" #include "ui/gl/gl_surface.h" #include "ui/views/controls/textfield/textfield.h" @@ -769,7 +769,7 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) { RunPendingMessages(); - aura::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow()); + ui::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow()); generator.GestureTapAt(gfx::Point(10, 10)); ShowQuickMenuImmediately(static_cast<TouchSelectionControllerImpl*>( textfield_test_api.touch_selection_controller())); |