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

Unified Diff: content/renderer/render_frame_impl.h

Issue 1293253002: Connect WebUSB client interface to the devices app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix memory leak in WeakBindingSet Created 5 years, 4 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 | « content/renderer/DEPS ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index cdeba40c86a8054de3aef1cb5afe6164cba72bc4..400026c8e8f69dcf5ffb391a03ccb9cb9b905087 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -26,6 +26,8 @@
#include "content/renderer/renderer_webcookiejar_impl.h"
#include "ipc/ipc_message.h"
#include "media/blink/webmediaplayer_delegate.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
+#include "mojo/application/public/interfaces/shell.mojom.h"
#include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
#include "third_party/WebKit/public/web/WebAXObject.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
@@ -545,6 +547,7 @@ class CONTENT_EXPORT RenderFrameImpl
virtual void unregisterProtocolHandler(const blink::WebString& scheme,
const blink::WebURL& url);
virtual blink::WebBluetooth* bluetooth();
+ virtual blink::WebUSBClient* usbClient();
#if defined(ENABLE_WEBVR)
blink::WebVRClient* webVRClient() override;
@@ -830,6 +833,10 @@ class CONTENT_EXPORT RenderFrameImpl
void RegisterMojoServices();
+ // Connects to a Mojo application and returns a proxy to its exposed
+ // ServiceProvider.
+ mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
+
// Stores the WebLocalFrame we are associated with. This is null from the
// constructor until SetWebFrame is called, and it is null after
// frameDetached is called until destruction (which is asynchronous in the
@@ -985,6 +992,9 @@ class CONTENT_EXPORT RenderFrameImpl
ServiceRegistryImpl service_registry_;
+ // The shell proxy used to connect to Mojo applications.
+ mojo::ShellPtr mojo_shell_;
+
// The screen orientation dispatcher attached to the frame, lazily
// initialized.
ScreenOrientationDispatcher* screen_orientation_dispatcher_;
@@ -1006,6 +1016,8 @@ class CONTENT_EXPORT RenderFrameImpl
scoped_ptr<blink::WebBluetooth> bluetooth_;
+ scoped_ptr<blink::WebUSBClient> usb_client_;
+
#if defined(ENABLE_WEBVR)
// The VR dispatcher attached to the frame, lazily initialized.
scoped_ptr<VRDispatcher> vr_dispatcher_;
« no previous file with comments | « content/renderer/DEPS ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698