Simple multi-url support for mojo apps

shell/application_manager/shell_impl.h

 // 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.
 
 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 class ApplicationManager;
 
 class ShellImpl : public Shell, public ErrorHandler {
  public:
+  enum QueryHandlingBehavior {

[qsr, 2015/02/27 15:01:41]

Can you comment on this, and on what behavior it does change.

[Aaron Boodman, 2015/02/27 16:54:44]

removed.

+    SHELL_DOES_NOT_HANDLE_QUERY,
+    SHELL_HANDLES_QUERY,
+  };
+
   ShellImpl(ApplicationPtr application,
             ApplicationManager* manager,
             const GURL& requested_url,
-            const GURL& url);
+            const GURL& url,
+            QueryHandlingBehavior query_behavior);
 
   ~ShellImpl() override;
 
   void InitializeApplication(Array<String> args);
 
-  void ConnectToClient(const GURL& requestor_url,
+  void ConnectToClient(const GURL& requested_url,
+                       const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);
 
   Application* application() { return application_.get(); }
   const GURL& url() const { return url_; }
   const GURL& requested_url() const { return requested_url_; }
+  bool handles_query() const { return handles_query_; }

[qsr, 2015/02/27 15:01:41]

As discussed offline, this is not necessary.

[Aaron Boodman, 2015/02/27 16:54:44]

agree, done.

 
  private:
   // Shell implementation:
   void ConnectToApplication(const String& app_url,
                             InterfaceRequest<ServiceProvider> services,
                             ServiceProviderPtr exposed_services) override;
 
   // ErrorHandler implementation:
   void OnConnectionError() override;
 
   ApplicationManager* const manager_;
   const GURL requested_url_;
   const GURL url_;
   ApplicationPtr application_;
   Binding<Shell> binding_;
 
+  // If true, this shell will handle connections to url_ with any querystring.
+  bool handles_query_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellImpl);
 };
 
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_