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

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

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.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
index e50c6fc953509130a27d6f2b9a94448dc02232c9..6126c104e9336001757963b42ead846365fe773e 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
@@ -24,13 +24,15 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
public:
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);
~ServiceRegistry() override;
// ApplicationConnection overrides.
void AddServiceConnector(ServiceConnectorBase* service_connector) override;
+ const std::string& GetConnectionURL() override;
const std::string& GetRemoteApplicationURL() override;
ServiceProvider* GetServiceProvider() override;
@@ -42,7 +44,8 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
ScopedMessagePipeHandle client_handle) override;
ApplicationImpl* application_impl_;
- const std::string url_;
+ const std::string connection_url_;
+ const std::string remote_url_;
private:
bool RemoveServiceConnectorInternal(ServiceConnectorBase* service_connector);

Powered by Google App Engine
This is Rietveld 408576698