| 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 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2246 // This is to support usage of WebSockets in cases in which there is an | 2246 // This is to support usage of WebSockets in cases in which there is an |
| 2247 // associated RenderFrame. This is important for showing the correct security | 2247 // associated RenderFrame. This is important for showing the correct security |
| 2248 // state of the page and also honoring user override of bad certificates. | 2248 // state of the page and also honoring user override of bad certificates. |
| 2249 GetInterfaceRegistry()->AddInterface( | 2249 GetInterfaceRegistry()->AddInterface( |
| 2250 base::Bind(&WebSocketManager::CreateWebSocket, | 2250 base::Bind(&WebSocketManager::CreateWebSocket, |
| 2251 process_->GetID(), | 2251 process_->GetID(), |
| 2252 routing_id_)); | 2252 routing_id_)); |
| 2253 | 2253 |
| 2254 #if defined(ENABLE_WEBVR) | 2254 #if defined(ENABLE_WEBVR) |
| 2255 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( | 2255 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( |
| 2256 base::Bind(&device::VRServiceImpl::BindRequest)); | 2256 base::Bind(&device::VRServiceImpl::Create)); |
| 2257 #endif | 2257 #endif |
| 2258 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { | 2258 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { |
| 2259 GetInterfaceRegistry()->AddInterface( | 2259 GetInterfaceRegistry()->AddInterface( |
| 2260 base::Bind(&device::SensorProviderImpl::Create, | 2260 base::Bind(&device::SensorProviderImpl::Create, |
| 2261 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)), | 2261 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)), |
| 2262 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2262 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 2263 } | 2263 } |
| 2264 | 2264 |
| 2265 #if BUILDFLAG(ENABLE_WEBRTC) | 2265 #if BUILDFLAG(ENABLE_WEBRTC) |
| 2266 // BrowserMainLoop::GetInstance() may be null on unit tests. | 2266 // BrowserMainLoop::GetInstance() may be null on unit tests. |
| (...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3316 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3316 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3317 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3317 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3318 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3318 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3319 return NavigationHandleImpl::Create( | 3319 return NavigationHandleImpl::Create( |
| 3320 params.url, frame_tree_node_, is_renderer_initiated, | 3320 params.url, frame_tree_node_, is_renderer_initiated, |
| 3321 params.was_within_same_page, base::TimeTicks::Now(), | 3321 params.was_within_same_page, base::TimeTicks::Now(), |
| 3322 entry_id_for_data_nav, false); // started_from_context_menu | 3322 entry_id_for_data_nav, false); // started_from_context_menu |
| 3323 } | 3323 } |
| 3324 | 3324 |
| 3325 } // namespace content | 3325 } // namespace content |
| OLD | NEW |