content/renderer/render_frame_impl.cc - Issue 1371793004: Provide the DeviceManager service to the renderer directly, no app.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1371793004: Provide the DeviceManager service to the renderer directly, no app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interface_permission

Patch Set: Fix header inclusion in chrome_content_browser_client.cc. Created 5 years, 3 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

« content/public/browser/content_browser_client.h ('K') | « content/public/browser/content_browser_client.h ('k') | content/renderer/usb/web_usb_client_impl.h » ('j') | device/devices_app/devices_app.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 5aed77678c39a1043d68ca080963acf06148d014..1322dcc2384687625b08dcc539cbd4d11d0d9cf2 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -3860,9 +3860,7 @@ blink::WebBluetooth* RenderFrameImpl::bluetooth() {

blink::WebUSBClient* RenderFrameImpl::usbClient() {

#if !defined(OS_ANDROID)

if (!usb_client_) {

- mojo::ServiceProviderPtr device_services =

- ConnectToApplication(GURL(device::kDevicesMojoAppUrl));

- usb_client_.reset(new WebUSBClientImpl(device_services.Pass()));

+ usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry()));

}

#endif

return usb_client_.get();