summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/root_window_controller_unittest.cc4
-rw-r--r--ash/shell_unittest.cc4
-rw-r--r--ash/wm/immersive_fullscreen_controller_unittest.cc6
-rw-r--r--ash/wm/system_gesture_event_filter_unittest.cc4
-rw-r--r--ash/wm/window_manager_unittest.cc8
-rw-r--r--ui/aura/aura.gyp2
-rw-r--r--ui/aura/window_event_dispatcher_unittest.cc28
-rw-r--r--ui/aura/window_targeter_unittest.cc4
-rw-r--r--ui/events/events.gyp2
-rw-r--r--ui/events/test/test_event_handler.cc (renamed from ui/aura/test/test_event_handler.cc)16
-rw-r--r--ui/events/test/test_event_handler.h (renamed from ui/aura/test/test_event_handler.h)24
-rw-r--r--ui/wm/core/input_method_event_filter_unittest.cc4
12 files changed, 53 insertions, 53 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 407f9b9..67a70ee 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -20,12 +20,12 @@
#include "ui/aura/client/window_tree_client.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tracker.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/keyboard/keyboard_controller_proxy.h"
#include "ui/keyboard/keyboard_switches.h"
#include "ui/views/controls/menu/menu_controller.h"
@@ -663,7 +663,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,
keyboard_window->SetBounds(gfx::Rect());
keyboard_window->Show();
- aura::test::TestEventHandler* handler = new aura::test::TestEventHandler;
+ ui::test::TestEventHandler* handler = new ui::test::TestEventHandler;
root_window->SetEventFilter(handler);
aura::test::EventGenerator event_generator(root_window, keyboard_window);
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 8b00092..781b32a 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -26,11 +26,11 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/events/test/events_test_utils.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/size.h"
#include "ui/views/controls/menu/menu_controller.h"
#include "ui/views/controls/menu/menu_runner.h"
@@ -516,7 +516,7 @@ TEST_F(ShellTest, TestPreTargetHandlerOrder) {
// Verifies an EventHandler added to Env gets notified from EventGenerator.
TEST_F(ShellTest, EnvPreTargetHandler) {
- aura::test::TestEventHandler event_handler;
+ ui::test::TestEventHandler event_handler;
aura::Env::GetInstance()->AddPreTargetHandler(&event_handler);
aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
generator.MoveMouseBy(1, 1);
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index ef86ac1..ca21e23 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -14,11 +14,11 @@
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/events/event_utils.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/native/native_view_host.h"
@@ -76,14 +76,14 @@ class MockImmersiveFullscreenControllerDelegate
DISALLOW_COPY_AND_ASSIGN(MockImmersiveFullscreenControllerDelegate);
};
-class ConsumeEventHandler : public aura::test::TestEventHandler {
+class ConsumeEventHandler : public ui::test::TestEventHandler {
public:
ConsumeEventHandler() {}
virtual ~ConsumeEventHandler() {}
private:
virtual void OnEvent(ui::Event* event) OVERRIDE {
- aura::test::TestEventHandler::OnEvent(event);
+ ui::test::TestEventHandler::OnEvent(event);
if (event->cancelable())
event->SetHandled();
}
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 44bfcff..39cdac8 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -23,7 +23,6 @@
#include "base/timer/timer.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -33,6 +32,7 @@
#include "ui/events/event_handler.h"
#include "ui/events/event_utils.h"
#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/size.h"
#include "ui/views/widget/widget_delegate.h"
@@ -578,7 +578,7 @@ TEST_P(SystemGestureEventFilterTest,
child->SetBounds(gfx::Rect(100, 100));
child->Show();
- aura::test::TestEventHandler event_handler;
+ ui::test::TestEventHandler event_handler;
aura::Env::GetInstance()->PrependPreTargetHandler(&event_handler);
GetEventGenerator().MoveMouseTo(0, 0);
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index d6672fe..b940474 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -15,7 +15,6 @@
#include "ui/aura/env.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
#include "ui/base/cursor/cursor.h"
@@ -23,6 +22,7 @@
#include "ui/events/event.h"
#include "ui/events/event_processor.h"
#include "ui/events/event_utils.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/screen.h"
#include "ui/wm/core/compound_event_filter.h"
#include "ui/wm/core/input_method_event_filter.h"
@@ -57,7 +57,7 @@ base::TimeDelta getTime() {
// A slightly changed TestEventHandler which can be configured to return a
// specified value for key/mouse event handling.
-class CustomEventHandler : public aura::test::TestEventHandler {
+class CustomEventHandler : public ui::test::TestEventHandler {
public:
CustomEventHandler()
: key_result_(ui::ER_UNHANDLED),
@@ -76,7 +76,7 @@ class CustomEventHandler : public aura::test::TestEventHandler {
// Overridden from ui::EventHandler:
virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
- aura::test::TestEventHandler::OnKeyEvent(event);
+ ui::test::TestEventHandler::OnKeyEvent(event);
if (key_result_ & ui::ER_HANDLED)
event->SetHandled();
if (key_result_ & ui::ER_CONSUMED)
@@ -84,7 +84,7 @@ class CustomEventHandler : public aura::test::TestEventHandler {
}
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
- aura::test::TestEventHandler::OnMouseEvent(event);
+ ui::test::TestEventHandler::OnMouseEvent(event);
if (mouse_result_ & ui::ER_HANDLED)
event->SetHandled();
if (mouse_result_ & ui::ER_CONSUMED)
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 22703ea..cc94586 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -169,8 +169,6 @@
'test/event_generator.h',
'test/test_cursor_client.cc',
'test/test_cursor_client.h',
- 'test/test_event_handler.cc',
- 'test/test_event_handler.h',
'test/test_focus_client.cc',
'test/test_focus_client.h',
'test/test_screen.cc',
diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc
index d8c14d0..85188c1 100644
--- a/ui/aura/window_event_dispatcher_unittest.cc
+++ b/ui/aura/window_event_dispatcher_unittest.cc
@@ -16,7 +16,6 @@
#include "ui/aura/test/env_test_helper.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_cursor_client.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
@@ -28,6 +27,7 @@
#include "ui/events/event_utils.h"
#include "ui/events/gestures/gesture_configuration.h"
#include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/screen.h"
@@ -85,14 +85,14 @@ class NonClientDelegate : public test::TestWindowDelegate {
};
// A simple event handler that consumes key events.
-class ConsumeKeyHandler : public test::TestEventHandler {
+class ConsumeKeyHandler : public ui::test::TestEventHandler {
public:
ConsumeKeyHandler() {}
virtual ~ConsumeKeyHandler() {}
// Overridden from ui::EventHandler:
virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
- test::TestEventHandler::OnKeyEvent(event);
+ ui::test::TestEventHandler::OnKeyEvent(event);
event->StopPropagation();
}
@@ -298,8 +298,8 @@ TEST_F(WindowEventDispatcherTest, CanProcessEventsWithinSubtree) {
TestEventClient client(root_window());
test::TestWindowDelegate d;
- test::TestEventHandler* nonlock_ef = new test::TestEventHandler;
- test::TestEventHandler* lock_ef = new test::TestEventHandler;
+ ui::test::TestEventHandler* nonlock_ef = new ui::test::TestEventHandler;
+ ui::test::TestEventHandler* lock_ef = new ui::test::TestEventHandler;
client.GetNonLockWindow()->SetEventFilter(nonlock_ef);
client.GetLockWindow()->SetEventFilter(lock_ef);
@@ -351,7 +351,7 @@ TEST_F(WindowEventDispatcherTest, CanProcessEventsWithinSubtree) {
}
TEST_F(WindowEventDispatcherTest, IgnoreUnknownKeys) {
- test::TestEventHandler* filter = new ConsumeKeyHandler;
+ ui::test::TestEventHandler* filter = new ConsumeKeyHandler;
root_window()->SetEventFilter(filter); // passes ownership
ui::KeyEvent unknown_event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0, false);
@@ -370,7 +370,7 @@ TEST_F(WindowEventDispatcherTest, NoDelegateWindowReceivesKeyEvents) {
w1->Show();
w1->Focus();
- test::TestEventHandler handler;
+ ui::test::TestEventHandler handler;
w1->AddPreTargetHandler(&handler);
ui::KeyEvent key_press(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, false);
DispatchEventUsingWindowDispatcher(&key_press);
@@ -383,7 +383,7 @@ TEST_F(WindowEventDispatcherTest, NoDelegateWindowReceivesKeyEvents) {
// Tests that touch-events that are beyond the bounds of the root-window do get
// propagated to the event filters correctly with the root as the target.
TEST_F(WindowEventDispatcherTest, TouchEventsOutsideBounds) {
- test::TestEventHandler* filter = new test::TestEventHandler;
+ ui::test::TestEventHandler* filter = new ui::test::TestEventHandler;
root_window()->SetEventFilter(filter); // passes ownership
gfx::Point position = root_window()->bounds().origin();
@@ -403,7 +403,7 @@ TEST_F(WindowEventDispatcherTest, TouchEventsOutsideBounds) {
// Tests that scroll events are dispatched correctly.
TEST_F(WindowEventDispatcherTest, ScrollEventDispatch) {
base::TimeDelta now = ui::EventTimeForNow();
- test::TestEventHandler* filter = new test::TestEventHandler;
+ ui::test::TestEventHandler* filter = new ui::test::TestEventHandler;
root_window()->SetEventFilter(filter);
test::TestWindowDelegate delegate;
@@ -753,7 +753,7 @@ TEST_F(WindowEventDispatcherTest, TouchMovesHeld) {
EXPECT_TRUE(filter->events().empty());
}
-class HoldPointerOnScrollHandler : public test::TestEventHandler {
+class HoldPointerOnScrollHandler : public ui::test::TestEventHandler {
public:
HoldPointerOnScrollHandler(WindowEventDispatcher* dispatcher,
EventFilterRecorder* filter)
@@ -1592,14 +1592,14 @@ TEST_F(WindowEventDispatcherTest, CaptureWindowDestroyed) {
EXPECT_EQ(NULL, capture_window_tracker.capture_window());
}
-class ExitMessageLoopOnMousePress : public test::TestEventHandler {
+class ExitMessageLoopOnMousePress : public ui::test::TestEventHandler {
public:
ExitMessageLoopOnMousePress() {}
virtual ~ExitMessageLoopOnMousePress() {}
protected:
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
- test::TestEventHandler::OnMouseEvent(event);
+ ui::test::TestEventHandler::OnMouseEvent(event);
if (event->type() == ui::ET_MOUSE_PRESSED)
base::MessageLoopForUI::current()->Quit();
}
@@ -1701,8 +1701,8 @@ TEST_F(WindowEventDispatcherTestInHighDPI, EventLocationTransform) {
1234, gfx::Rect(20, 20, 100, 100), root_window()));
child->Show();
- test::TestEventHandler handler_child;
- test::TestEventHandler handler_root;
+ ui::test::TestEventHandler handler_child;
+ ui::test::TestEventHandler handler_root;
root_window()->AddPreTargetHandler(&handler_root);
child->AddPreTargetHandler(&handler_child);
diff --git a/ui/aura/window_targeter_unittest.cc b/ui/aura/window_targeter_unittest.cc
index 985426b..f14d337 100644
--- a/ui/aura/window_targeter_unittest.cc
+++ b/ui/aura/window_targeter_unittest.cc
@@ -6,9 +6,9 @@
#include "ui/aura/scoped_window_targeter.h"
#include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
+#include "ui/events/test/test_event_handler.h"
namespace aura {
@@ -64,7 +64,7 @@ TEST_F(WindowTargeterTest, Basic) {
root_window()->Show();
- test::TestEventHandler handler;
+ ui::test::TestEventHandler handler;
one->AddPreTargetHandler(&handler);
ui::MouseEvent press(ui::ET_MOUSE_PRESSED,
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 7ef892d..30d2a41 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -233,6 +233,8 @@
'test/events_test_utils.h',
'test/events_test_utils_x11.cc',
'test/events_test_utils_x11.h',
+ 'test/test_event_handler.cc',
+ 'test/test_event_handler.h',
'test/test_event_processor.cc',
'test/test_event_processor.h',
'test/test_event_target.cc',
diff --git a/ui/aura/test/test_event_handler.cc b/ui/events/test/test_event_handler.cc
index 5611a99..19b7191 100644
--- a/ui/aura/test/test_event_handler.cc
+++ b/ui/events/test/test_event_handler.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test/test_event_handler.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/events/event.h"
-namespace aura {
+namespace ui {
namespace test {
TestEventHandler::TestEventHandler()
@@ -27,26 +27,26 @@ void TestEventHandler::Reset() {
num_gesture_events_ = 0;
}
-void TestEventHandler::OnKeyEvent(ui::KeyEvent* event) {
+void TestEventHandler::OnKeyEvent(KeyEvent* event) {
num_key_events_++;
event->SetHandled();
}
-void TestEventHandler::OnMouseEvent(ui::MouseEvent* event) {
+void TestEventHandler::OnMouseEvent(MouseEvent* event) {
num_mouse_events_++;
}
-void TestEventHandler::OnScrollEvent(ui::ScrollEvent* event) {
+void TestEventHandler::OnScrollEvent(ScrollEvent* event) {
num_scroll_events_++;
}
-void TestEventHandler::OnTouchEvent(ui::TouchEvent* event) {
+void TestEventHandler::OnTouchEvent(TouchEvent* event) {
num_touch_events_++;
}
-void TestEventHandler::OnGestureEvent(ui::GestureEvent* event) {
+void TestEventHandler::OnGestureEvent(GestureEvent* event) {
num_gesture_events_++;
}
} // namespace test
-} // namespace aura
+} // namespace ui
diff --git a/ui/aura/test/test_event_handler.h b/ui/events/test/test_event_handler.h
index 4998630..e0c2fca 100644
--- a/ui/aura/test/test_event_handler.h
+++ b/ui/events/test/test_event_handler.h
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_TEST_TEST_EVENT_HANDLER_H_
-#define UI_AURA_TEST_TEST_EVENT_HANDLER_H_
+#ifndef UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_
+#define UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/events/event_handler.h"
-namespace aura {
+namespace ui {
namespace test {
// A simple EventHandler that keeps track of the number of key events that it's
// seen.
-class TestEventHandler : public ui::EventHandler {
+class TestEventHandler : public EventHandler {
public:
TestEventHandler();
virtual ~TestEventHandler();
@@ -27,12 +27,12 @@ class TestEventHandler : public ui::EventHandler {
void Reset();
- // ui::EventHandler overrides:
- virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
- virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ // EventHandler overrides:
+ virtual void OnKeyEvent(KeyEvent* event) OVERRIDE;
+ virtual void OnMouseEvent(MouseEvent* event) OVERRIDE;
+ virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE;
+ virtual void OnTouchEvent(TouchEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(GestureEvent* event) OVERRIDE;
private:
// How many events have been received of each type?
@@ -46,6 +46,6 @@ class TestEventHandler : public ui::EventHandler {
};
} // namespace test
-} // namespace aura
+} // namespace ui
-#endif // UI_AURA_TEST_TEST_EVENT_HANDLER_H_
+#endif // UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_
diff --git a/ui/wm/core/input_method_event_filter_unittest.cc b/ui/wm/core/input_method_event_filter_unittest.cc
index e5a35e8..71dbcce 100644
--- a/ui/wm/core/input_method_event_filter_unittest.cc
+++ b/ui/wm/core/input_method_event_filter_unittest.cc
@@ -9,9 +9,9 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/wm/core/compound_event_filter.h"
#if !defined(OS_WIN) && !defined(USE_X11)
@@ -54,7 +54,7 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
root_filter->AddHandler(&input_method_event_filter);
// Add TestEventFilter to the RootWindow.
- aura::test::TestEventHandler test_filter;
+ ui::test::TestEventHandler test_filter;
root_filter->AddHandler(&test_filter);
// We need an active window. Otherwise, the root window will not forward a key
generated by cgit v1.1 at 2024-09-24 02:29:41 +0000