| 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 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2194 | 2194 |
| 2195 // This is to support usage of WebSockets in cases in which there is an | 2195 // This is to support usage of WebSockets in cases in which there is an |
| 2196 // associated RenderFrame. This is important for showing the correct security | 2196 // associated RenderFrame. This is important for showing the correct security |
| 2197 // state of the page and also honoring user override of bad certificates. | 2197 // state of the page and also honoring user override of bad certificates. |
| 2198 GetInterfaceRegistry()->AddInterface( | 2198 GetInterfaceRegistry()->AddInterface( |
| 2199 base::Bind(&WebSocketManager::CreateWebSocket, | 2199 base::Bind(&WebSocketManager::CreateWebSocket, |
| 2200 process_->GetID(), | 2200 process_->GetID(), |
| 2201 routing_id_)); | 2201 routing_id_)); |
| 2202 | 2202 |
| 2203 #if defined(ENABLE_WEBVR) | 2203 #if defined(ENABLE_WEBVR) |
| 2204 GetInterfaceRegistry()->AddInterface<device::VRService>( | 2204 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( |
| 2205 base::Bind(&device::VRServiceImpl::BindRequest)); | 2205 base::Bind(&device::VRServiceImpl::BindRequest)); |
| 2206 #endif | 2206 #endif |
| 2207 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { | 2207 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { |
| 2208 GetInterfaceRegistry()->AddInterface( | 2208 GetInterfaceRegistry()->AddInterface( |
| 2209 base::Bind(&device::SensorProviderImpl::Create), | 2209 base::Bind(&device::SensorProviderImpl::Create), |
| 2210 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2210 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 2211 } | 2211 } |
| 2212 | 2212 |
| 2213 #if defined(ENABLE_WEBRTC) | 2213 #if defined(ENABLE_WEBRTC) |
| 2214 // BrowserMainLoop::GetInstance() may be null on unit tests. | 2214 // BrowserMainLoop::GetInstance() may be null on unit tests. |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3149 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3149 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3150 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3150 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3151 return web_bluetooth_service_.get(); | 3151 return web_bluetooth_service_.get(); |
| 3152 } | 3152 } |
| 3153 | 3153 |
| 3154 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3154 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3155 web_bluetooth_service_.reset(); | 3155 web_bluetooth_service_.reset(); |
| 3156 } | 3156 } |
| 3157 | 3157 |
| 3158 } // namespace content | 3158 } // namespace content |
| OLD | NEW |