| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/public/cpp/application/lib/service_registry.h" | 5 #include "mojo/public/cpp/application/lib/service_registry.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/application/application_connection.h" | 7 #include "mojo/public/cpp/application/application_connection.h" |
| 8 #include "mojo/public/cpp/application/service_connector.h" | 8 #include "mojo/public/cpp/application/service_connector.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 const std::string& ServiceRegistry::GetConnectionURL() { | 41 const std::string& ServiceRegistry::GetConnectionURL() { |
| 42 return connection_context_.connection_url; | 42 return connection_context_.connection_url; |
| 43 } | 43 } |
| 44 | 44 |
| 45 const std::string& ServiceRegistry::GetRemoteApplicationURL() { | 45 const std::string& ServiceRegistry::GetRemoteApplicationURL() { |
| 46 return connection_context_.remote_url; | 46 return connection_context_.remote_url; |
| 47 } | 47 } |
| 48 | 48 |
| 49 void ServiceRegistry::ConnectToService(const String& service_name, | 49 void ServiceRegistry::ConnectToService(const String& service_name, |
| 50 ScopedMessagePipeHandle client_handle) { | 50 ScopedMessagePipeHandle client_handle) { |
| 51 service_connector_registry_.ConnectToService(this, service_name, | 51 service_connector_registry_.ConnectToService(connection_context_, |
| 52 &client_handle); | 52 service_name, &client_handle); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace internal | 55 } // namespace internal |
| 56 } // namespace mojo | 56 } // namespace mojo |
| OLD | NEW |