Simple multi-url support for mojo apps

shell/application_manager/shell_impl.cc

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..b205114922b860da9189365c9e53ec159edccf66 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -13,12 +13,14 @@ namespace mojo {
 ShellImpl::ShellImpl(ApplicationPtr application,
                      ApplicationManager* manager,
                      const GURL& requested_url,
-                     const GURL& url)
+                     const GURL& url,
+                     QueryHandlingBehavior query_behavior)
     : manager_(manager),
       requested_url_(requested_url),
       url_(url),
       application_(application.Pass()),
-      binding_(this) {
+      binding_(this),
+      handles_query_(query_behavior == SHELL_HANDLES_QUERY) {
   binding_.set_error_handler(this);
 }
 
@@ -31,11 +33,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: