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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 943053003: Simple multi-url support for mojo apps (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebase + fix android 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: shell/application_manager/shell_impl.cc
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index 8b679a9a2d6e4bdce5689b810341d5659f104d36..677e84ec924f9498c7f112086cc50b7c73b2d34c 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -31,11 +31,12 @@ void ShellImpl::InitializeApplication(Array<String> args) {
application_->Initialize(shell.Pass(), args.Pass(), url_.spec());
}
-void ShellImpl::ConnectToClient(const GURL& requestor_url,
+void ShellImpl::ConnectToClient(const GURL& requested_url,
+ const GURL& requestor_url,
InterfaceRequest<ServiceProvider> services,
ServiceProviderPtr exposed_services) {
application_->AcceptConnection(String::From(requestor_url), services.Pass(),
- exposed_services.Pass());
+ exposed_services.Pass(), requested_url.spec());
}
// Shell implementation:

Powered by Google App Engine
This is Rietveld 408576698