content/browser/frame_host/render_frame_host_impl.cc - Issue 1858293002: bluetooth: Enable Web Bluetooth on experimental framework

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/browser/frame_host/render_frame_host_impl.cc

Issue 1858293002: bluetooth: Enable Web Bluetooth on experimental framework (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Created 4 years, 8 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 | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_impl.cc

diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc

index 1b0946ed27a3be5f7a206ee54f60ed6e959bd417..08621f7a63120e6109a3e2606293f784e3c88369 100644

--- a/content/browser/frame_host/render_frame_host_impl.cc

+++ b/content/browser/frame_host/render_frame_host_impl.cc

@@ -1896,8 +1896,13 @@ void RenderFrameHostImpl::RegisterMojoServices() {

GetServiceRegistry()->AddService(base::Bind(

&PresentationServiceImpl::CreateMojoService, base::Unretained(this)));

- if (base::CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableWebBluetooth)) {

+ bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableWebBluetooth);

+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)

+ enable_web_bluetooth = true;

+#endif

+ if (enable_web_bluetooth) {

GetServiceRegistry()->AddService(

base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService,

base::Unretained(this)));