OLD | NEW |
---|---|
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 2160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2171 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { | 2171 if (base::FeatureList::IsEnabled(media::kAndroidMediaPlayerRenderer)) { |
2172 // Creates a MojoRendererService, passing it a MediaPlayerRender. | 2172 // Creates a MojoRendererService, passing it a MediaPlayerRender. |
2173 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( | 2173 GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(base::Bind( |
2174 &content::CreateMediaPlayerRenderer, base::Unretained(this))); | 2174 &content::CreateMediaPlayerRenderer, base::Unretained(this))); |
2175 } | 2175 } |
2176 #else | 2176 #else |
2177 GetInterfaceRegistry()->AddInterface( | 2177 GetInterfaceRegistry()->AddInterface( |
2178 base::Bind(&device::VibrationManagerImpl::Create)); | 2178 base::Bind(&device::VibrationManagerImpl::Create)); |
2179 #endif // defined(OS_ANDROID) | 2179 #endif // defined(OS_ANDROID) |
2180 | 2180 |
2181 // Web Bluetooth is shipped on Android, ChromeOS & MacOS, experimental | |
2182 // otherwise. | |
2181 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( | 2183 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( |
2182 switches::kEnableWebBluetooth); | 2184 switches::kEnableExperimentalWebPlatformFeatures); |
Rick Byers
2016/10/27 20:37:53
Note that this won't necessarily match blink's vie
juncai
2016/10/27 21:54:26
Done.
| |
2183 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX) | 2185 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX) |
2184 enable_web_bluetooth = true; | 2186 enable_web_bluetooth = true; |
2185 #endif | 2187 #endif |
2186 | 2188 |
2187 if (enable_web_bluetooth) { | 2189 if (enable_web_bluetooth) { |
2188 GetInterfaceRegistry()->AddInterface(base::Bind( | 2190 GetInterfaceRegistry()->AddInterface(base::Bind( |
2189 base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService), | 2191 base::IgnoreResult(&RenderFrameHostImpl::CreateWebBluetoothService), |
2190 base::Unretained(this))); | 2192 base::Unretained(this))); |
2191 } | 2193 } |
2192 | 2194 |
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3149 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3151 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
3150 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3152 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
3151 return web_bluetooth_service_.get(); | 3153 return web_bluetooth_service_.get(); |
3152 } | 3154 } |
3153 | 3155 |
3154 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3156 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
3155 web_bluetooth_service_.reset(); | 3157 web_bluetooth_service_.reset(); |
3156 } | 3158 } |
3157 | 3159 |
3158 } // namespace content | 3160 } // namespace content |
OLD | NEW |