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

Unified Diff: services/window_manager/focus_controller_unittest.cc

Issue 1287103004: Sync ui/events to chromium @ https://codereview.chromium.org/1210203002 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 4 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 | « mojo/converters/input_events/input_events_type_converters.cc ('k') | services/window_manager/view_target.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/focus_controller_unittest.cc
diff --git a/services/window_manager/focus_controller_unittest.cc b/services/window_manager/focus_controller_unittest.cc
index ba47c7355cb985b4ee083d5571f03512b6819208..684906bee84769b96a40024a25ba27b25f7974c6 100644
--- a/services/window_manager/focus_controller_unittest.cc
+++ b/services/window_manager/focus_controller_unittest.cc
@@ -4,6 +4,7 @@
#include "services/window_manager/focus_controller.h"
+#include "ui/events/event_utils.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "services/window_manager/basic_focus_rules.h"
#include "services/window_manager/capture_controller.h"
@@ -413,12 +414,14 @@ class FocusControllerTestBase : public testing::Test {
root_view_->target(), &center);
ui::MouseEvent button_down(ui::ET_MOUSE_PRESSED, center, center,
+ ui::EventTimeForNow(),
ui::EF_LEFT_MOUSE_BUTTON, ui::EF_NONE);
ui::EventDispatchDetails details =
view_event_dispatcher_->OnEventFromSource(&button_down);
CHECK(!details.dispatcher_destroyed);
ui::MouseEvent button_up(ui::ET_MOUSE_RELEASED, center, center,
+ ui::EventTimeForNow(),
ui::EF_LEFT_MOUSE_BUTTON, ui::EF_NONE);
details = view_event_dispatcher_->OnEventFromSource(&button_up);
CHECK(!details.dispatcher_destroyed);
« no previous file with comments | « mojo/converters/input_events/input_events_type_converters.cc ('k') | services/window_manager/view_target.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698