Index: components/view_manager/event_dispatcher.cc |
diff --git a/components/view_manager/event_dispatcher.cc b/components/view_manager/event_dispatcher.cc |
index a06e7c22bf59d0cbd3c8c130b68176e0b5f0b1c5..23213a7dc4b54b88943a592dd6c867420715ab5f 100644 |
--- a/components/view_manager/event_dispatcher.cc |
+++ b/components/view_manager/event_dispatcher.cc |
@@ -30,15 +30,11 @@ void EventDispatcher::RemoveAccelerator(mojo::KeyboardCode keyboard_code, |
accelerators_.erase(Accelerator(keyboard_code, flags)); |
} |
-void EventDispatcher::OnEvent(mojo::EventPtr event, |
- const OnEventCallback& callback) { |
- callback.Run(); |
- |
+void EventDispatcher::OnEvent(mojo::EventPtr event) { |
if (event->pointer_data) { |
const gfx::Point root_point(static_cast<int>(event->pointer_data->x), |
static_cast<int>(event->pointer_data->y)); |
ServerView* target = connection_manager_->GetFocusedView(); |
- ; |
if (event->action == mojo::EVENT_TYPE_POINTER_DOWN || !target) { |
target = FindDeepestVisibleView(connection_manager_->root(), root_point); |
CHECK(target); |
@@ -49,6 +45,7 @@ void EventDispatcher::OnEvent(mojo::EventPtr event, |
gfx::PointF(event->pointer_data->x, event->pointer_data->y))); |
event->pointer_data->x = local_point.x(); |
event->pointer_data->y = local_point.y(); |
+ |
sky
2015/06/05 23:25:50
IMO this relates to the previous code, so no newli
Fady Samuel
2015/06/05 23:34:52
Done.
|
connection_manager_->DispatchInputEventToView(target, event.Pass()); |
} else if (event->action == mojo::EVENT_TYPE_KEY_PRESSED && |
accelerators_.count(Accelerator(event->key_data->windows_key_code, |