Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: mojo/services/html_viewer/html_document_view.h

Issue 694923002: Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/public/js/bindings/connection.js ('k') | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index 831a7295a751fab527923780ee103bb9db3a311d..68314854b098367548af6ac27304106fe90791aa 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -8,6 +8,9 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/application/lazy_interface_ptr.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/cpp/bindings/interface_impl.h"
+#include "mojo/public/interfaces/application/application.mojom.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"
@@ -29,7 +32,8 @@ class View;
class WebLayerTreeViewImpl;
// A view for a single HTML document.
-class HTMLDocumentView : public blink::WebViewClient,
+class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
+ public blink::WebViewClient,
public blink::WebFrameClient,
public ViewManagerDelegate,
public ViewObserver {
@@ -43,13 +47,17 @@ class HTMLDocumentView : public blink::WebViewClient,
//
// |shell| is the Shell connection for this mojo::Application.
HTMLDocumentView(URLResponsePtr response,
- InterfaceRequest<ServiceProvider> service_provider_request,
- Shell* shell,
+ ShellPtr shell,
scoped_refptr<base::MessageLoopProxy> compositor_thread,
WebMediaPlayerFactory* web_media_player_factory);
virtual ~HTMLDocumentView();
private:
+ // Application methods:
+ void AcceptConnection(const String& requestor_url,
+ ServiceProviderPtr provider) override;
+ void Initialize(Array<String> args) override;
+
// WebViewClient methods:
virtual blink::WebStorageNamespace* createSessionStorageNamespace();
@@ -102,8 +110,9 @@ class HTMLDocumentView : public blink::WebViewClient,
void Load(URLResponsePtr response);
URLResponsePtr response_;
+ ServiceProviderImpl exported_services_;
scoped_ptr<ServiceProvider> embedder_service_provider_;
- Shell* shell_;
+ ShellPtr shell_;
LazyInterfacePtr<NavigatorHost> navigator_host_;
blink::WebView* web_view_;
View* root_;
« no previous file with comments | « mojo/public/js/bindings/connection.js ('k') | mojo/services/html_viewer/html_document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698