Expose NavigatorHost via Embed() rather than globally.

mojo/services/html_viewer/html_document_view.h

 // 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.
 
 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "mojo/public/cpp/application/lazy_interface_ptr.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/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 
 namespace mojo {
 
 class ViewManager;
 class View;
 
 // A view for a single HTML document.
 class HTMLDocumentView : public blink::WebViewClient,
                          public blink::WebFrameClient,
                          public ViewManagerDelegate,
                          public ViewObserver {
  public:
   // Load a new HTMLDocument with |response|.
   //
-  // |imported_from_connector| is used to request services of the connecting
-  // application (e.g., the application that called
-  // Shell::ConnectToApplication()).
-  //
-  // |exported_to_connector| is used to export services from this
-  // HTMLDocumentView to the connecting application.
+  // |service_provider_request| should be used to implement a
+  // ServiceProvider which exposes services to the connecting application.
+  // Commonly, the connecting application is the ViewManager and it will
+  // request ViewManagerClient.
   //
   // |shell| is the Shell connection for this mojo::Application.
   HTMLDocumentView(URLResponsePtr response,
-                   scoped_ptr<ServiceProvider> imported_from_connector,
-                   ServiceProviderImpl* exported_to_connector,
+                   InterfaceRequest<ServiceProvider> service_provider_request,
                    Shell* shell);
   virtual ~HTMLDocumentView();
 
  private:
   // WebViewClient methods:
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
   // WebWidgetClient methods:
   virtual void didInvalidateRect(const blink::WebRect& rect);
   virtual bool allowsBrokenNullLayerTreeView() const;
@@ skipping 14 matching lines @@
       const blink::WebString& stack_trace);
   virtual void didNavigateWithinPage(
       blink::WebLocalFrame* frame,
       const blink::WebHistoryItem& history_item,
       blink::WebHistoryCommitType commit_type);
 
   // ViewManagerDelegate methods:
   virtual void OnEmbed(
       ViewManager* view_manager,
       View* root,
-      ServiceProviderImpl* exported_to_embedder,
-      scoped_ptr<ServiceProvider> exported_from_embedder) OVERRIDE;
+      ServiceProviderImpl* embedee_service_provider_impl,
+      scoped_ptr<ServiceProvider> embedder_service_provider) OVERRIDE;
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE;
 
   // ViewObserver methods:
   virtual void OnViewBoundsChanged(View* view,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnViewDestroyed(View* view) OVERRIDE;
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
 
   void Load(URLResponsePtr response);
   void Repaint();
-  NavigatorHost* GetNavigatorHost();
 
   URLResponsePtr response_;
-  scoped_ptr<ServiceProvider> imported_services_;
+  scoped_ptr<ServiceProvider> embedder_service_provider_;
   Shell* shell_;
-  InterfacePtr<NavigatorHost> navigator_host_;
+  LazyInterfacePtr<NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   View* root_;
   ViewManagerClientFactory view_manager_client_factory_;
   bool repaint_pending_;
 
   base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_