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

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: Change ref to pointer 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
« no previous file with comments | « 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') | Show Comments 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 d1e89938eed79cf680da24c78b0fc7131881b373..9026ea0b35a1abab3a460983282f85e692715abb 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4342,13 +4342,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();
}
« no previous file with comments | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698