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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: fixed layout tests on Linux and Windows Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2206 matching lines...) Expand 10 before | Expand all | Expand 10 after
2217 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { 2217 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) {
2218 // Creates a MojoRendererService, passing it a MediaPlayerRender. 2218 // Creates a MojoRendererService, passing it a MediaPlayerRender.
2219 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( 2219 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind(
2220 &content::CreateMediaPlayerRenderer, base::Unretained(this))); 2220 &content::CreateMediaPlayerRenderer, base::Unretained(this)));
2221 } 2221 }
2222 #else 2222 #else
2223 GetInterfaceRegistry()->AddInterface( 2223 GetInterfaceRegistry()->AddInterface(
2224 base::Bind(&device::VibrationManagerImpl::Create)); 2224 base::Bind(&device::VibrationManagerImpl::Create));
2225 #endif // defined(OS_ANDROID) 2225 #endif // defined(OS_ANDROID)
2226 2226
2227 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( 2227 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(
scheib 2016/10/21 01:02:10 Let's explain this with // Web Bluetooth is shipp
juncai 2016/10/21 16:57:54 Done.
2228 switches::kEnableWebBluetooth); 2228 switches::kEnableExperimentalWebPlatformFeatures);
2229 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX) 2229 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
2230 enable_web_bluetooth = true; 2230 enable_web_bluetooth = true;
2231 #endif 2231 #endif
2232 2232
2233 if (enable_web_bluetooth) { 2233 if (enable_web_bluetooth) {
2234 GetInterfaceRegistry()->AddInterface(base::Bind( 2234 GetInterfaceRegistry()->AddInterface(base::Bind(
2235 base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService), 2235 base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService),
2236 base::Unretained(this))); 2236 base::Unretained(this)));
2237 } 2237 }
2238 2238
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
3187 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3187 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3188 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3188 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3189 return web_bluetooth_service_.get(); 3189 return web_bluetooth_service_.get();
3190 } 3190 }
3191 3191
3192 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3192 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3193 web_bluetooth_service_.reset(); 3193 web_bluetooth_service_.reset();
3194 } 3194 }
3195 3195
3196 } // namespace content 3196 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698