| Index: mojo/services/html_viewer/html_document.cc
|
| diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc
|
| index 2d56d142c7f88ff40e012a6ea89938d1fb59a92d..d1c570821f3fa1d0827d7c329f6723f7e25cd043 100644
|
| --- a/mojo/services/html_viewer/html_document.cc
|
| +++ b/mojo/services/html_viewer/html_document.cc
|
| @@ -99,7 +99,7 @@ bool CanNavigateLocally(blink::WebFrame* frame,
|
| } // namespace
|
|
|
| HTMLDocument::HTMLDocument(
|
| - mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| + mojo::ServiceProviderImpl* service_provider,
|
| URLResponsePtr response,
|
| mojo::Shell* shell,
|
| scoped_refptr<base::MessageLoopProxy> compositor_thread,
|
| @@ -113,9 +113,9 @@ HTMLDocument::HTMLDocument(
|
| compositor_thread_(compositor_thread),
|
| web_media_player_factory_(web_media_player_factory),
|
| is_headless_(is_headless) {
|
| - exported_services_.AddService(this);
|
| - exported_services_.AddService(&view_manager_client_factory_);
|
| - exported_services_.Bind(services.Pass());
|
| + printf("MSW HTMLDocument::HTMLDocument\n");
|
| + service_provider->AddService(this);
|
| + service_provider->AddService(&view_manager_client_factory_);
|
| Load(response_.Pass());
|
| }
|
|
|
| @@ -143,6 +143,7 @@ void HTMLDocument::OnEmbed(
|
|
|
| void HTMLDocument::Create(mojo::ApplicationConnection* connection,
|
| mojo::InterfaceRequest<AxProvider> request) {
|
| + printf("MSW HTMLDocument::Create (AxProvider) web_view=%p\n", web_view_);
|
| if (!web_view_)
|
| return;
|
| ax_provider_impls_.insert(
|
|
|