mojo: Update content handler API

sky/viewer/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 "sky/viewer/document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
 #include "skia/ext/refptr.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/public/platform/WebHTTPHeaderVisitor.h"
 #include "sky/engine/public/web/WebConsoleMessage.h"
 #include "sky/engine/public/web/WebDocument.h"
 #include "sky/engine/public/web/WebElement.h"
@@ skipping 34 matching lines @@
       return mojo::TARGET_NEW_NODE;
     default:
       return mojo::TARGET_DEFAULT;
   }
 }
 
 }  // namespace
 
 DocumentView::DocumentView(
     mojo::URLResponsePtr response,
-    mojo::InterfaceRequest<mojo::ServiceProvider> service_provider_request,
-    mojo::Shell* shell,
+    mojo::ShellPtr shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread)
     : response_(response.Pass()),
-      shell_(shell),
+      shell_(shell.Pass()),
       web_view_(NULL),
       root_(NULL),
-      view_manager_client_factory_(shell, this),
+      view_manager_client_factory_(shell_.get(), this),
       inspector_service_factory_(this),
       compositor_thread_(compositor_thread),
       weak_factory_(this) {
-  mojo::ServiceProviderImpl* exported_services = new mojo::ServiceProviderImpl();
-  exported_services->AddService(&view_manager_client_factory_);
-  BindToRequest(exported_services, &service_provider_request);
+  shell_.set_client(this);
 }
 
 DocumentView::~DocumentView() {
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
+void DocumentView::AcceptConnection(const mojo::String& requestor_url,
+                                    mojo::ServiceProviderPtr provider) {
+  exported_services_.AddService(&view_manager_client_factory_);
+  mojo::WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+}
+
+void DocumentView::Initialize(mojo::Array<mojo::String> args) {
+}
+
 void DocumentView::OnEmbed(
     mojo::ViewManager* view_manager,
     mojo::View* root,
     mojo::ServiceProviderImpl* exported_services,
     scoped_ptr<mojo::ServiceProvider> imported_services) {
 
   root_ = root;
   imported_services_ = imported_services.Pass();
   navigator_host_.set_service_provider(imported_services_.get());
   exported_services->AddService(&inspector_service_factory_);
@@ skipping 91 matching lines @@
 
 void DocumentView::OnViewInputEvent(
     mojo::View* view, const mojo::EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent> >();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace sky