OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "content/browser/download/save_file_manager.h" | 46 #include "content/browser/download/save_file_manager.h" |
47 #include "content/browser/gamepad/gamepad_service.h" | 47 #include "content/browser/gamepad/gamepad_service.h" |
48 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 48 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
49 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" | 49 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" |
50 #include "content/browser/gpu/compositor_util.h" | 50 #include "content/browser/gpu/compositor_util.h" |
51 #include "content/browser/gpu/gpu_data_manager_impl.h" | 51 #include "content/browser/gpu/gpu_data_manager_impl.h" |
52 #include "content/browser/gpu/gpu_process_host.h" | 52 #include "content/browser/gpu/gpu_process_host.h" |
53 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 53 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
54 #include "content/browser/histogram_synchronizer.h" | 54 #include "content/browser/histogram_synchronizer.h" |
55 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 55 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 56 #include "content/browser/loader_delegate_impl.h" |
56 #include "content/browser/media/media_internals.h" | 57 #include "content/browser/media/media_internals.h" |
57 #include "content/browser/mojo/mojo_shell_context.h" | 58 #include "content/browser/mojo/mojo_shell_context.h" |
58 #include "content/browser/net/browser_online_state_observer.h" | 59 #include "content/browser/net/browser_online_state_observer.h" |
59 #include "content/browser/renderer_host/media/media_stream_manager.h" | 60 #include "content/browser/renderer_host/media/media_stream_manager.h" |
60 #include "content/browser/renderer_host/render_process_host_impl.h" | 61 #include "content/browser/renderer_host/render_process_host_impl.h" |
61 #include "content/browser/speech/speech_recognition_manager_impl.h" | 62 #include "content/browser/speech/speech_recognition_manager_impl.h" |
62 #include "content/browser/startup_task_runner.h" | 63 #include "content/browser/startup_task_runner.h" |
63 #include "content/browser/time_zone_monitor.h" | 64 #include "content/browser/time_zone_monitor.h" |
64 #include "content/browser/utility_process_host_impl.h" | 65 #include "content/browser/utility_process_host_impl.h" |
65 #include "content/browser/webui/content_web_ui_controller_factory.h" | 66 #include "content/browser/webui/content_web_ui_controller_factory.h" |
(...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1251 device_monitor_linux_.reset( | 1252 device_monitor_linux_.reset( |
1252 new media::DeviceMonitorLinux(io_thread_->task_runner())); | 1253 new media::DeviceMonitorLinux(io_thread_->task_runner())); |
1253 #elif defined(OS_MACOSX) | 1254 #elif defined(OS_MACOSX) |
1254 device_monitor_mac_.reset(new media::DeviceMonitorMac()); | 1255 device_monitor_mac_.reset(new media::DeviceMonitorMac()); |
1255 #endif | 1256 #endif |
1256 | 1257 |
1257 #if defined(OS_WIN) | 1258 #if defined(OS_WIN) |
1258 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", | 1259 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", |
1259 IsWin32kRendererLockdownEnabled()); | 1260 IsWin32kRendererLockdownEnabled()); |
1260 #endif | 1261 #endif |
| 1262 |
1261 // RDH needs the IO thread to be created | 1263 // RDH needs the IO thread to be created |
1262 { | 1264 { |
1263 TRACE_EVENT0("startup", | 1265 TRACE_EVENT0("startup", |
1264 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); | 1266 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); |
1265 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl()); | 1267 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl()); |
| 1268 |
| 1269 loader_delegate_.reset(new LoaderDelegateImpl()); |
| 1270 resource_dispatcher_host_->SetLoaderDelegate(loader_delegate_.get()); |
1266 } | 1271 } |
1267 | 1272 |
1268 // MediaStreamManager needs the IO thread to be created. | 1273 // MediaStreamManager needs the IO thread to be created. |
1269 { | 1274 { |
1270 TRACE_EVENT0("startup", | 1275 TRACE_EVENT0("startup", |
1271 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); | 1276 "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager"); |
1272 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); | 1277 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); |
1273 } | 1278 } |
1274 | 1279 |
1275 { | 1280 { |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1504 std::move(worker_task_runner), | 1509 std::move(worker_task_runner), |
1505 MediaInternals::GetInstance()); | 1510 MediaInternals::GetInstance()); |
1506 } | 1511 } |
1507 CHECK(audio_manager_); | 1512 CHECK(audio_manager_); |
1508 | 1513 |
1509 if (use_hang_monitor) | 1514 if (use_hang_monitor) |
1510 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); | 1515 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); |
1511 } | 1516 } |
1512 | 1517 |
1513 } // namespace content | 1518 } // namespace content |
OLD | NEW |