Chromium Code Reviews| Index: components/mus/view_tree_host_impl.cc |
| diff --git a/components/mus/view_tree_host_impl.cc b/components/mus/view_tree_host_impl.cc |
| index 7f04d19d4054242bb6f05d5396e1d8038dc86424..2367587cbe53806d55b29fe86e05b02b6f47d9b2 100644 |
| --- a/components/mus/view_tree_host_impl.cc |
| +++ b/components/mus/view_tree_host_impl.cc |
| @@ -113,7 +113,6 @@ void ViewTreeHostImpl::DispatchInputEventToView(const ServerView* target, |
| connection_manager_->GetConnectionWithRoot(target->id()); |
| if (!connection) |
| connection = connection_manager_->GetConnection(target->id().connection_id); |
| - DCHECK_EQ(this, connection->GetHost()); |
| connection->client()->OnViewInputEvent(ViewIdToTransportId(target->id()), |
| event.Pass(), |
| base::Bind(&base::DoNothing)); |
| @@ -150,7 +149,12 @@ ServerView* ViewTreeHostImpl::GetRootView() { |
| return root_.get(); |
| } |
| -void ViewTreeHostImpl::OnEvent(mojo::EventPtr event) { |
| +void ViewTreeHostImpl::OnEvent(ViewId id, mojo::EventPtr event) { |
| + ServerView* view = connection_manager_->GetView(id); |
| + if (view) { |
|
sky
2015/09/17 22:36:05
How about a TODO here, as this should really be a
Fady Samuel
2015/09/17 23:58:01
Done.
|
| + DispatchInputEventToView(view, event.Pass()); |
| + return; |
| + } |
| event_dispatcher_.OnEvent(event.Pass()); |
| } |