Mojo: teach launcher about mojo:// URLs.

mojo/examples/window_manager/window_manager.cc

Index: mojo/examples/window_manager/window_manager.cc
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
index d533d5033c9fbd6ffdc3d87804090d68f2b524e8..5ccacd236292ac4def37b45c30372b0e42b29ae5 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/mojo/examples/window_manager/window_manager.cc
@@ -113,9 +113,9 @@ class WindowManager : public Application,
     if (event->action == ui::ET_MOUSE_RELEASED) {
       std::string app_url;
       if (event->flags & ui::EF_LEFT_MOUSE_BUTTON)
-        app_url = "mojo:mojo_embedded_app";
+        app_url = "mojo://mojo_embedded_app";

[Aaron Boodman, 2014/06/19 20:27:32]

Both work, but this form is canonical.

       else if (event->flags & ui::EF_RIGHT_MOUSE_BUTTON)
-        app_url = "mojo:mojo_nesting_app";
+        app_url = "mojo://mojo_nesting_app";
       DCHECK(!app_url.empty());
 
       Node* node = view_manager_->GetNodeById(parent_node_id_);
@@ -149,16 +149,12 @@ class WindowManager : public Application,
 
   // Overridden from LauncherClient:
   virtual void OnLaunch(
-      const mojo::String& handler_url, mojo::URLResponsePtr response,
-      mojo::ScopedDataPipeConsumerHandle response_body_stream) OVERRIDE {
+      const mojo::String& requested_url, const mojo::String& handler_url,
+      navigation::ResponseDetailsPtr response) OVERRIDE {
     navigation::NavigationDetailsPtr nav_details(
         navigation::NavigationDetails::New());
-    nav_details->url = response->url;
-    navigation::ResponseDetailsPtr response_details(
-        navigation::ResponseDetails::New());
-    response_details->response = response.Pass();
-    response_details->response_body_stream = response_body_stream.Pass();
-    CreateWindow(handler_url, nav_details.Pass(), response_details.Pass());
+    nav_details->url = requested_url;

[Ben Goodger (Google), 2014/06/19 21:09:47]

redundant with response->url?

[Aaron Boodman, 2014/06/19 21:25:12]

No, because |response| might be null.

We could avoid needing this by changing the Launcher API to be like:

Launch(string url) => (foo, bar, baz)

That way, we could pass a closure for the callback containing the original URL.

But then the caller will need to be sure to check whether response->url is
present and prefer it to requested_url. I think it is safer to just have one
code path and have launcher always tell you the final URL you should be
navigating to.

+    CreateWindow(handler_url, nav_details.Pass(), response.Pass());
   }
 
   void CreateLauncherUI() {