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