Eliminate Launchable. Use Navigator instead.

mojo/examples/browser/browser.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 "mojo/public/cpp/application/application.h"
+#include "mojo/services/navigation/navigation.mojom.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "mojo/views/views_init.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
@@ skipping 118 matching lines @@
       GURL url(sender->text());
       printf("User entered this URL: %s\n", url.spec().c_str());
       launcher_->Launch(url.spec());
     }
     return false;
   }
 
   // launcher::LauncherClient:
   virtual void OnLaunch(
       const String& handler_url,
-      URLResponsePtr response,
-      ScopedDataPipeConsumerHandle response_body_stream) OVERRIDE {
+      navigation::ResponseDetailsPtr response_details) OVERRIDE {
     content_node_->Embed(handler_url);
 
-    launcher::LaunchablePtr launchable;
-    ConnectTo(handler_url, &launchable);
-    launchable->OnLaunch(response.Pass(),
-                         response_body_stream.Pass(),
-                         content_node_->id());
+    navigation::NavigationDetailsPtr navigation_details(
+        navigation::NavigationDetails::New());
+    navigation_details->url = response_details->response->url;
+
+    navigation::NavigatorPtr navigator;
+    ConnectTo(handler_url, &navigator);
+    navigator->Navigate(content_node_->id(),
+                        navigation_details.Pass(),
+                        response_details.Pass());
   }
 
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
   view_manager::View* view_;
   view_manager::Node* content_node_;
   launcher::LauncherPtr launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo