Mojo: teach launcher about mojo:// URLs.

mojo/examples/window_manager/window_manager.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
@@ skipping 95 matching lines @@
     AddService<WindowManagerConnection>(this);
     AddService<NavigatorHost>(this);
     ViewManager::Create(this, this);
   }
 
     // Overridden from ViewObserver:
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
     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";
       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_);
       navigation::NavigationDetailsPtr nav_details(
           navigation::NavigationDetails::New());
       size_t index = node->children().size() - 1;
       nav_details->url = base::StringPrintf(
           "%s/%x", app_url.c_str(), kColors[index % arraysize(kColors)]);
       navigation::ResponseDetailsPtr response;
       CreateWindow(app_url, nav_details.Pass(), response.Pass());
@@ skipping 13 matching lines @@
     View* view = View::Create(view_manager);
     node->SetActiveView(view);
     view->SetColor(SK_ColorBLUE);
     view->AddObserver(this);
 
     CreateLauncherUI();
   }
 
   // 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;
+    CreateWindow(handler_url, nav_details.Pass(), response.Pass());
   }
 
   void CreateLauncherUI() {
     navigation::NavigationDetailsPtr nav_details;
     navigation::ResponseDetailsPtr response;
     launcher_ui_ = CreateChild("mojo:mojo_browser", gfx::Rect(25, 25, 400, 25),
                                nav_details.Pass(), response.Pass());
   }
 
   void CreateWindow(const std::string& handler_url,
@@ skipping 48 matching lines @@
 }
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::WindowManager;
 }
 
 }  // namespace mojo