Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b

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/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/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/html_viewer/blink_input_events_type_converters.h"
 #include "mojo/services/html_viewer/blink_url_request_type_converters.h"
 #include "mojo/services/html_viewer/weblayertreeview_impl.h"
 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
 #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
 #include "mojo/services/html_viewer/weburlloader_impl.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
@@ skipping 55 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,
-    InterfaceRequest<ServiceProvider> service_provider_request,
-    Shell* shell,
+    ShellPtr shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread,
     WebMediaPlayerFactory* web_media_player_factory)
-    : shell_(shell),
+    : shell_(shell.Pass()),
       web_view_(NULL),
       root_(NULL),
-      view_manager_client_factory_(shell, this),
+      view_manager_client_factory_(shell_.get(), this),
       compositor_thread_(compositor_thread),
       web_media_player_factory_(web_media_player_factory),
       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::AcceptConnection(const String& requestor_url,
+                                        ServiceProviderPtr provider) {
+  exported_services_.AddService(&view_manager_client_factory_);
+  WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+}
+
+void HTMLDocumentView::Initialize(Array<String> args) {
+}
+
 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());
 
   blink::WebSize root_size(root_->bounds().width, root_->bounds().height);
@@ skipping 49 matching lines @@
 
 blink::WebLayerTreeView* HTMLDocumentView::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client) {
   return web_media_player_factory_->CreateMediaPlayer(
-      frame, url, client, shell_);
+      frame, url, client, shell_.get());
 }
 
 blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm) {
   return createMediaPlayer(frame, url, client);
 }
 
@@ skipping 61 matching lines @@
 }
 
 void HTMLDocumentView::OnViewInputEvent(View* view, const EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent> >();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace mojo