Expose NavigatorHost via Embed() rather than globally.

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 "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner_chromium.h"
+#include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.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_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "mojo/views/views_init.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
@@ skipping 137 matching lines @@
     if (root_)
       root_->RemoveObserver(this);
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
     views_init_.reset(new ViewsInit);
-    app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
     app->ConnectToService("mojo:mojo_window_manager", &window_manager_);
  }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   void CreateWidget(View* view) {
@@ skipping 19 matching lines @@
     widget_->Show();
     textfield->RequestFocus();
   }
 
   // ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
                        View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
     // TODO: deal with OnEmbed() being invoked multiple times.
+    ConnectToService(imported_services.get(), &navigator_host_);
     view_manager_ = view_manager;
     root_ = root;
     root_->AddObserver(this);
     root_->SetFocus();
     CreateWidget(root_);
   }
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) OVERRIDE {
     DCHECK_EQ(view_manager_, view_manager);
     view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
     if (key_event.key_code() == ui::VKEY_RETURN) {
       GURL url(sender->text());
       printf("User entered this URL: %s\n", url.spec().c_str());
       NavigationDetailsPtr nav_details(NavigationDetails::New());
       nav_details->request->url = String::From(url);
-      navigator_host_->RequestNavigate(view_manager_->GetRoots().front()->id(),
-                                       TARGET_NEW_NODE,
-                                       nav_details.Pass());
+      navigator_host_->RequestNavigate(TARGET_NEW_NODE, nav_details.Pass());
     }
     return false;
   }
 
   // ViewObserver:
   virtual void OnViewFocusChanged(View* gained_focus,
                                   View* lost_focus) OVERRIDE {
     aura::client::FocusClient* focus_client =
         aura::client::GetFocusClient(widget_->GetNativeView());
     if (lost_focus == root_)
@@ skipping 19 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
   return runner.Run(shell_handle);
 }