| 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 2179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2190 | 2190 |
| 2191 // This is to support usage of WebSockets in cases in which there is an | 2191 // This is to support usage of WebSockets in cases in which there is an |
| 2192 // associated RenderFrame. This is important for showing the correct security | 2192 // associated RenderFrame. This is important for showing the correct security |
| 2193 // state of the page and also honoring user override of bad certificates. | 2193 // state of the page and also honoring user override of bad certificates. |
| 2194 GetInterfaceRegistry()->AddInterface( | 2194 GetInterfaceRegistry()->AddInterface( |
| 2195 base::Bind(&WebSocketManager::CreateWebSocket, | 2195 base::Bind(&WebSocketManager::CreateWebSocket, |
| 2196 process_->GetID(), | 2196 process_->GetID(), |
| 2197 routing_id_)); | 2197 routing_id_)); |
| 2198 | 2198 |
| 2199 #if defined(ENABLE_WEBVR) | 2199 #if defined(ENABLE_WEBVR) |
| 2200 GetInterfaceRegistry()->AddInterface<device::VRService>( | 2200 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( |
| 2201 base::Bind(&device::VRServiceImpl::BindRequest)); | 2201 base::Bind(&device::VRServiceImpl::BindRequest)); |
| 2202 #endif | 2202 #endif |
| 2203 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { | 2203 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { |
| 2204 GetInterfaceRegistry()->AddInterface( | 2204 GetInterfaceRegistry()->AddInterface( |
| 2205 base::Bind(&device::SensorProviderImpl::Create), | 2205 base::Bind(&device::SensorProviderImpl::Create), |
| 2206 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2206 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 2207 } | 2207 } |
| 2208 | 2208 |
| 2209 #if defined(ENABLE_WEBRTC) | 2209 #if defined(ENABLE_WEBRTC) |
| 2210 // BrowserMainLoop::GetInstance() may be null on unit tests. | 2210 // BrowserMainLoop::GetInstance() may be null on unit tests. |
| (...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3138 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3138 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3139 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3139 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3140 return web_bluetooth_service_.get(); | 3140 return web_bluetooth_service_.get(); |
| 3141 } | 3141 } |
| 3142 | 3142 |
| 3143 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3143 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3144 web_bluetooth_service_.reset(); | 3144 web_bluetooth_service_.reset(); |
| 3145 } | 3145 } |
| 3146 | 3146 |
| 3147 } // namespace content | 3147 } // namespace content |
| OLD | NEW |