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 16 matching lines...) Expand all Loading... |
27 command_line->InitFromArgv(app_impl_->args()); | 27 command_line->InitFromArgv(app_impl_->args()); |
28 logging::LoggingSettings settings; | 28 logging::LoggingSettings settings; |
29 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 29 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
30 logging::InitLogging(settings); | 30 logging::InitLogging(settings); |
31 | 31 |
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->GetServiceProviderImpl().AddService<mojo::ui::ViewAssociate>( |
| 38 [this](const mojo::ConnectionContext& connection_context, |
| 39 mojo::InterfaceRequest<mojo::ui::ViewAssociate> |
| 40 view_associate_request) { |
| 41 input_associates_.AddBinding(new InputAssociate(), |
| 42 view_associate_request.Pass()); |
| 43 }); |
38 return true; | 44 return true; |
39 } | 45 } |
40 | 46 |
41 void InputManagerApp::Create( | |
42 const mojo::ConnectionContext& connection_context, | |
43 mojo::InterfaceRequest<mojo::ui::ViewAssociate> request) { | |
44 input_associates.AddBinding(new InputAssociate(), request.Pass()); | |
45 } | |
46 | |
47 } // namespace input_manager | 47 } // namespace input_manager |
OLD | NEW |