| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/ui/input_manager/input_manager_app.h" | 5 #include "services/ui/input_manager/input_manager_app.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 tracing_.Initialize(app_impl); | 32 tracing_.Initialize(app_impl); |
| 33 } | 33 } |
| 34 | 34 |
| 35 bool InputManagerApp::ConfigureIncomingConnection( | 35 bool InputManagerApp::ConfigureIncomingConnection( |
| 36 mojo::ApplicationConnection* connection) { | 36 mojo::ApplicationConnection* connection) { |
| 37 connection->AddService<mojo::ui::ViewAssociate>(this); | 37 connection->AddService<mojo::ui::ViewAssociate>(this); |
| 38 return true; | 38 return true; |
| 39 } | 39 } |
| 40 | 40 |
| 41 void InputManagerApp::Create( | 41 void InputManagerApp::Create( |
| 42 mojo::ApplicationConnection* connection, | 42 const mojo::ConnectionContext& connection_context, |
| 43 mojo::InterfaceRequest<mojo::ui::ViewAssociate> request) { | 43 mojo::InterfaceRequest<mojo::ui::ViewAssociate> request) { |
| 44 input_associates.AddBinding(new InputAssociate(), request.Pass()); | 44 input_associates.AddBinding(new InputAssociate(), request.Pass()); |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace input_manager | 47 } // namespace input_manager |
| OLD | NEW |