Update view manager to support content handling.

mojo/services/html_viewer/html_viewer.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/message_loop/message_loop.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/interface_factory_impl.h"
 #include "mojo/services/html_viewer/blink_platform_impl.h"
 #include "mojo/services/html_viewer/html_document_view.h"
 #include "mojo/services/public/cpp/view_manager/types.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/services/public/interfaces/content_handler/content_handler.mojom.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
 namespace mojo {
 
 class HTMLViewer;
 
-class NavigatorImpl : public InterfaceImpl<Navigator> {
+class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
  public:
-  explicit NavigatorImpl(HTMLViewer* viewer) : viewer_(viewer) {}
-  virtual ~NavigatorImpl() {}
+  explicit ContentHandlerImpl(HTMLViewer* viewer) : viewer_(viewer) {}
+  virtual ~ContentHandlerImpl() {}
 
  private:
-  // Overridden from Navigator:
-  virtual void Navigate(
-      uint32_t view_id,
-      NavigationDetailsPtr navigation_details,
-      ResponseDetailsPtr response_details) OVERRIDE;
+  // Overridden from ContentHandler:
+  virtual void OnConnect(mojo::String url,
+                         ResponseDetailsPtr response_details,
+                         ServiceProviderPtr service_provider) OVERRIDE;
 
   HTMLViewer* viewer_;
 
-  DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
+  DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
 class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
  public:
   HTMLViewer()
       : application_impl_(NULL),
         document_view_(NULL),
-        navigator_factory_(this),
+        content_handler_factory_(this),
         view_manager_client_factory_(this) {}
   virtual ~HTMLViewer() {
     blink::shutdown();
   }
 
   void Load(ResponseDetailsPtr response_details) {
     // Need to wait for OnEmbed.
     response_details_ = response_details.Pass();
     MaybeLoad();
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
     application_impl_ = app;
     blink_platform_impl_.reset(new BlinkPlatformImpl(app));
     blink::initialize(blink_platform_impl_.get());
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
-    connection->AddService(&navigator_factory_);
+    connection->AddService(&content_handler_factory_);
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
                        View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
     document_view_ = new HTMLDocumentView(
@@ skipping 11 matching lines @@
     if (document_view_ && response_details_)
       document_view_->Load(response_details_->response.Pass());
   }
 
   scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
   ApplicationImpl* application_impl_;
 
   // TODO(darin): Figure out proper ownership of this instance.
   HTMLDocumentView* document_view_;
   ResponseDetailsPtr response_details_;
-  InterfaceFactoryImplWithContext<NavigatorImpl, HTMLViewer> navigator_factory_;
+  InterfaceFactoryImplWithContext<ContentHandlerImpl, HTMLViewer>
+      content_handler_factory_;
   ViewManagerClientFactory view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
-void NavigatorImpl::Navigate(
-    uint32_t view_id,
-    NavigationDetailsPtr navigation_details,
-    ResponseDetailsPtr response_details) {
-  viewer_->Load(response_details.Pass());
+void ContentHandlerImpl::OnConnect(const mojo::String& url,
+                                   URLResponsePtr url_response,
+                                   ServiceProviderPtr service_provider) {
+  viewer_->Load(url_response.Pass());
 }
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new HTMLViewer;
 }
 
 }