| Index: mojo/examples/browser/browser.cc
|
| diff --git a/mojo/examples/browser/browser.cc b/mojo/examples/browser/browser.cc
|
| index 35162c95801923ec0736d1caba1156c537366a5e..ec45601a6a96428ec503977675c748c6d2881839 100644
|
| --- a/mojo/examples/browser/browser.cc
|
| +++ b/mojo/examples/browser/browser.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #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/view.h"
|
| #include "mojo/services/public/cpp/view_manager/view_manager.h"
|
| #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
|
| @@ -149,11 +150,15 @@ class Browser : public Application,
|
| ScopedDataPipeConsumerHandle response_body_stream) 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 details(
|
| + navigation::NavigationDetails::New());
|
| + details->url = response->url;
|
| + details->response = response.Pass();
|
| + details->response_body_stream = response_body_stream.Pass();
|
| +
|
| + navigation::NavigatorPtr navigator;
|
| + ConnectTo(handler_url, &navigator);
|
| + navigator->Navigate(content_node_->id(), details.Pass());
|
| }
|
|
|
| scoped_ptr<ViewsInit> views_init_;
|
|
|