Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Fix build issues. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/test/widget_test_mac.mm ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
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 d2f0e65e321ad5efa02ad74c90804886e2768f6b..6321b2b3e4f1a6bbf8e0314d3c4a38d70b6233d5 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
@@ -469,18 +469,18 @@ void GenerateMouseEvents(Widget* widget, ui::EventType last_event_type) {
ui::MouseEvent move_event(ui::ET_MOUSE_MOVED, screen_bounds.CenterPoint(),
screen_bounds.CenterPoint(), ui::EventTimeForNow(),
0, 0);
- ui::EventProcessor* dispatcher = WidgetTest::GetEventProcessor(widget);
- ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move_event);
+ ui::EventSink* sink = WidgetTest::GetEventSink(widget);
+ ui::EventDispatchDetails details = sink->OnEventFromSource(&move_event);
if (last_event_type == ui::ET_MOUSE_ENTERED || details.dispatcher_destroyed)
return;
- details = dispatcher->OnEventFromSource(&move_event);
+ details = sink->OnEventFromSource(&move_event);
if (last_event_type == ui::ET_MOUSE_MOVED || details.dispatcher_destroyed)
return;
ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, screen_bounds.CenterPoint(),
screen_bounds.CenterPoint(), ui::EventTimeForNow(),
0, 0);
- details = dispatcher->OnEventFromSource(&press_event);
+ details = sink->OnEventFromSource(&press_event);
if (last_event_type == ui::ET_MOUSE_PRESSED || details.dispatcher_destroyed)
return;
@@ -488,13 +488,13 @@ void GenerateMouseEvents(Widget* widget, ui::EventType last_event_type) {
end_point.Offset(1, 1);
ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, end_point, end_point,
ui::EventTimeForNow(), 0, 0);
- details = dispatcher->OnEventFromSource(&drag_event);
+ details = sink->OnEventFromSource(&drag_event);
if (last_event_type == ui::ET_MOUSE_DRAGGED || details.dispatcher_destroyed)
return;
ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, end_point, end_point,
ui::EventTimeForNow(), 0, 0);
- details = dispatcher->OnEventFromSource(&release_event);
+ details = sink->OnEventFromSource(&release_event);
if (details.dispatcher_destroyed)
return;
}
@@ -569,7 +569,7 @@ TEST_F(WidgetTest, WindowMouseModalityTest) {
cursor_location_main, ui::EventTimeForNow(),
ui::EF_NONE, ui::EF_NONE);
ui::EventDispatchDetails details =
- GetEventProcessor(&top_level_widget)->OnEventFromSource(&move_main);
+ GetEventSink(&top_level_widget)->OnEventFromSource(&move_main);
ASSERT_FALSE(details.dispatcher_destroyed);
EXPECT_EQ(1, widget_view->GetEventCount(ui::ET_MOUSE_ENTERED));
@@ -594,8 +594,8 @@ TEST_F(WidgetTest, WindowMouseModalityTest) {
ui::MouseEvent mouse_down_dialog(
ui::ET_MOUSE_PRESSED, cursor_location_dialog, cursor_location_dialog,
ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
- details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
- &mouse_down_dialog);
+ details =
+ GetEventSink(&top_level_widget)->OnEventFromSource(&mouse_down_dialog);
ASSERT_FALSE(details.dispatcher_destroyed);
EXPECT_EQ(1, dialog_widget_view->GetEventCount(ui::ET_MOUSE_PRESSED));
@@ -605,8 +605,8 @@ TEST_F(WidgetTest, WindowMouseModalityTest) {
ui::MouseEvent mouse_down_main(ui::ET_MOUSE_MOVED, cursor_location_main2,
cursor_location_main2, ui::EventTimeForNow(),
ui::EF_NONE, ui::EF_NONE);
- details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
- &mouse_down_main);
+ details =
+ GetEventSink(&top_level_widget)->OnEventFromSource(&mouse_down_main);
ASSERT_FALSE(details.dispatcher_destroyed);
EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED));
« no previous file with comments | « ui/views/test/widget_test_mac.mm ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698