Expose NavigatorHost via Embed() rather than globally.

mojo/services/html_viewer/html_document_view.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 "mojo/services/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
@@ skipping 65 matching lines @@
 
   // Otherwise we don't know if we're the right app to handle this request. Ask
   // host to do the navigation for us.
   return false;
 }
 
 }  // namespace
 
 HTMLDocumentView::HTMLDocumentView(
     URLResponsePtr response,
-    scoped_ptr<ServiceProvider> imported_services,
-    ServiceProviderImpl* exported_services,
+    InterfaceRequest<ServiceProvider> service_provider_request,
     Shell* shell)
-    : imported_services_(imported_services.Pass()),
-      shell_(shell),
+    : shell_(shell),
       web_view_(NULL),
       root_(NULL),
       view_manager_client_factory_(shell, this),
       repaint_pending_(false),
       weak_factory_(this) {
-
+  ServiceProviderImpl* exported_services = new ServiceProviderImpl();
   exported_services->AddService(&view_manager_client_factory_);
+  BindToRequest(exported_services, &service_provider_request);
   Load(response.Pass());
 }
 
 HTMLDocumentView::~HTMLDocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
-void HTMLDocumentView::OnEmbed(ViewManager* view_manager,
-                               View* root,
-                               ServiceProviderImpl* exported_services,
-                               scoped_ptr<ServiceProvider> imported_services) {
+void HTMLDocumentView::OnEmbed(
+    ViewManager* view_manager,
+    View* root,
+    ServiceProviderImpl* embedee_service_provider_impl,
+    scoped_ptr<ServiceProvider> embedder_service_provider) {
   root_ = root;
+  embedder_service_provider_ = embedder_service_provider.Pass();
+  navigator_host_.set_service_provider(embedder_service_provider_.get());
+
   root_->SetColor(SK_ColorCYAN);  // Dummy background color.
   web_view_->resize(root_->bounds().size());
   root_->AddObserver(this);
 }
 
 void HTMLDocumentView::OnViewManagerDisconnected(ViewManager* view_manager) {
   // TODO(aa): Need to figure out how shutdown works.
 }
 
 void HTMLDocumentView::Load(URLResponsePtr response) {
@@ skipping 61 matching lines @@
 blink::WebNavigationPolicy HTMLDocumentView::decidePolicyForNavigation(
     blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data,
     const blink::WebURLRequest& request, blink::WebNavigationType nav_type,
     blink::WebNavigationPolicy default_policy, bool is_redirect) {
   if (CanNavigateLocally(frame, request))
     return default_policy;
 
   NavigationDetailsPtr nav_details(NavigationDetails::New());
   nav_details->request = URLRequest::From(request);
 
-  GetNavigatorHost()->RequestNavigate(
-      root_->id(),
+  navigator_host_->RequestNavigate(
       WebNavigationPolicyToNavigationTarget(default_policy),
       nav_details.Pass());
 
   return blink::WebNavigationPolicyIgnore;
 }
 
 void HTMLDocumentView::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
 }
 
 void HTMLDocumentView::didNavigateWithinPage(
     blink::WebLocalFrame* frame, const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
-  GetNavigatorHost()->DidNavigateLocally(root_->id(),
-                                         history_item.urlString().utf8());
+  navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
 }
 
 void HTMLDocumentView::OnViewBoundsChanged(View* view,
                                            const gfx::Rect& old_bounds,
                                            const gfx::Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   web_view_->resize(view->bounds().size());
 }
 
 void HTMLDocumentView::OnViewDestroyed(View* view) {
@@ skipping 22 matching lines @@
   int height = web_view_->size().height;
 
   skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(SkCanvas::NewRaster(
       SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType)));
 
   web_view_->paint(canvas.get(), gfx::Rect(0, 0, width, height));
 
   root_->SetContents(canvas->getDevice()->accessBitmap(false));
 }
 
-NavigatorHost* HTMLDocumentView::GetNavigatorHost() {
-  if (!navigator_host_.get()) {
-    // TODO(aa): This should come via |imported_services| in OnEmbed().
-    InterfacePtr<ServiceProvider> sp;
-    shell_->ConnectToApplication("mojo:mojo_window_manager", Get(&sp));
-    ConnectToService(sp.get(), &navigator_host_);
-  }
-  return navigator_host_.get();
-}
-
 }  // namespace mojo