| 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 2248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2259 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( | 2259 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>( |
| 2260 base::Bind(&device::VRServiceImpl::BindRequest)); | 2260 base::Bind(&device::VRServiceImpl::BindRequest)); |
| 2261 #endif | 2261 #endif |
| 2262 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { | 2262 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { |
| 2263 GetInterfaceRegistry()->AddInterface( | 2263 GetInterfaceRegistry()->AddInterface( |
| 2264 base::Bind(&device::SensorProviderImpl::Create, | 2264 base::Bind(&device::SensorProviderImpl::Create, |
| 2265 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)), | 2265 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)), |
| 2266 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2266 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 2267 } | 2267 } |
| 2268 | 2268 |
| 2269 #if defined(ENABLE_WEBRTC) | 2269 #if BUILDFLAG(ENABLE_WEBRTC) |
| 2270 // BrowserMainLoop::GetInstance() may be null on unit tests. | 2270 // BrowserMainLoop::GetInstance() may be null on unit tests. |
| 2271 if (BrowserMainLoop::GetInstance()) { | 2271 if (BrowserMainLoop::GetInstance()) { |
| 2272 // BrowserMainLoop, which owns MediaStreamManager, is alive for the lifetime | 2272 // BrowserMainLoop, which owns MediaStreamManager, is alive for the lifetime |
| 2273 // of Mojo communication (see BrowserMainLoop::ShutdownThreadsAndCleanUp(), | 2273 // of Mojo communication (see BrowserMainLoop::ShutdownThreadsAndCleanUp(), |
| 2274 // which shuts down Mojo). Hence, passing that MediaStreamManager instance | 2274 // which shuts down Mojo). Hence, passing that MediaStreamManager instance |
| 2275 // as a raw pointer here is safe. | 2275 // as a raw pointer here is safe. |
| 2276 MediaStreamManager* media_stream_manager = | 2276 MediaStreamManager* media_stream_manager = |
| 2277 BrowserMainLoop::GetInstance()->media_stream_manager(); | 2277 BrowserMainLoop::GetInstance()->media_stream_manager(); |
| 2278 GetInterfaceRegistry()->AddInterface( | 2278 GetInterfaceRegistry()->AddInterface( |
| 2279 base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(), | 2279 base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(), |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3304 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3304 // There is no pending NavigationEntry in these cases, so pass 0 as the |
| 3305 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3305 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
| 3306 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3306 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
| 3307 return NavigationHandleImpl::Create( | 3307 return NavigationHandleImpl::Create( |
| 3308 params.url, frame_tree_node_, is_renderer_initiated, | 3308 params.url, frame_tree_node_, is_renderer_initiated, |
| 3309 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), | 3309 params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(), |
| 3310 entry_id_for_data_nav, false); // started_from_context_menu | 3310 entry_id_for_data_nav, false); // started_from_context_menu |
| 3311 } | 3311 } |
| 3312 | 3312 |
| 3313 } // namespace content | 3313 } // namespace content |
| OLD | NEW |