Simple multi-url support for mojo apps

shell/application_manager/shell_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "shell/application_manager/shell_impl.h"
 
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "shell/application_manager/application_manager.h"
 
 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);
 }
 
 ShellImpl::~ShellImpl() {
 }
 
 void ShellImpl::InitializeApplication(Array<String> args) {
   ShellPtr shell;
   binding_.Bind(GetProxy(&shell));
   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:
 void ShellImpl::ConnectToApplication(const String& app_url,
                                      InterfaceRequest<ServiceProvider> services,
                                      ServiceProviderPtr exposed_services) {
   GURL app_gurl(app_url);
   if (!app_gurl.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << app_url;
     return;
   }
   manager_->ConnectToApplication(app_gurl, url_, services.Pass(),
                                  exposed_services.Pass());
 }
 
 void ShellImpl::OnConnectionError() {
   manager_->OnShellImplError(this);
 }
 
 }  // namespace mojo