Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc

Issue 975973002: Update mojo sdk to rev f68e697e389943cd9bf9652397312280e96b127a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shake fist at msvc Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
index e0a7d2856eb21c995591f0373e6d3252fa09bdca..337d8e08e9c18c76da0eb1021f67ae2bc401764f 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
@@ -13,11 +13,13 @@ namespace internal {
ServiceRegistry::ServiceRegistry(
ApplicationImpl* application_impl,
- const std::string& url,
+ const std::string& connection_url,
+ const std::string& remote_url,
ServiceProviderPtr remote_services,
InterfaceRequest<ServiceProvider> local_services)
: application_impl_(application_impl),
- url_(url),
+ connection_url_(connection_url),
+ remote_url_(remote_url),
local_binding_(this),
remote_service_provider_(remote_services.Pass()) {
if (local_services.is_pending())
@@ -63,8 +65,12 @@ bool ServiceRegistry::RemoveServiceConnectorInternal(
return true;
}
+const std::string& ServiceRegistry::GetConnectionURL() {
+ return connection_url_;
+}
+
const std::string& ServiceRegistry::GetRemoteApplicationURL() {
- return url_;
+ return remote_url_;
}
ServiceProvider* ServiceRegistry::GetServiceProvider() {

Powered by Google App Engine
This is Rietveld 408576698