content/renderer/render_frame_impl.cc - Issue 1922923002: bluetooth: Move requestDevice to mojo

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 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device

Patch Set: Merge Created 4 years, 7 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/browser/renderer_host/render_process_host_impl.cc ('K') | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
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 ed2b611bed047fcbbfaef807bb92a21c478f094b..ab5e509d86169f4093ad8baaf6f64a3496b100f7 100644

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

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

@@ -4381,13 +4381,9 @@ void RenderFrameImpl::unregisterProtocolHandler(const WebString& scheme,

}

blink::WebBluetooth* RenderFrameImpl::bluetooth() {

- // ChildThreadImpl::current() is null in some tests.

- if (!bluetooth_ && ChildThreadImpl::current()) {

- bluetooth_.reset(new WebBluetoothImpl(

- GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(),

- routing_id_));

+ if (!bluetooth_.get()) {

+ bluetooth_.reset(new WebBluetoothImpl(GetServiceRegistry()));

}

return bluetooth_.get();

}