| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 #if defined(OS_CHROMEOS) | 147 #if defined(OS_CHROMEOS) |
| 148 #include "base/memory/memory_pressure_monitor_chromeos.h" | 148 #include "base/memory/memory_pressure_monitor_chromeos.h" |
| 149 #include "chromeos/chromeos_switches.h" | 149 #include "chromeos/chromeos_switches.h" |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if defined(USE_GLIB) | 152 #if defined(USE_GLIB) |
| 153 #include <glib-object.h> | 153 #include <glib-object.h> |
| 154 #endif | 154 #endif |
| 155 | 155 |
| 156 #if defined(OS_WIN) | 156 #if defined(OS_WIN) |
| 157 #include "media/capture/system_message_window_win.h" | 157 #include "device/capture/system_message_window_win.h" |
| 158 #elif defined(OS_LINUX) && defined(USE_UDEV) | 158 #elif defined(OS_LINUX) && defined(USE_UDEV) |
| 159 #include "media/capture/device_monitor_udev.h" | 159 #include "device/capture/device_monitor_udev.h" |
| 160 #elif defined(OS_MACOSX) | 160 #elif defined(OS_MACOSX) |
| 161 #include "media/capture/device_monitor_mac.h" | 161 #include "device/capture/device_monitor_mac.h" |
| 162 #endif | 162 #endif |
| 163 | 163 |
| 164 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 164 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 165 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 165 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
| 166 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 166 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
| 167 | 167 |
| 168 #if !defined(OS_ANDROID) | 168 #if !defined(OS_ANDROID) |
| 169 #include "content/public/browser/zygote_handle_linux.h" | 169 #include "content/public/browser/zygote_handle_linux.h" |
| 170 #endif // !defined(OS_ANDROID) | 170 #endif // !defined(OS_ANDROID) |
| 171 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 171 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| (...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); | 1270 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); |
| 1271 CreateAudioManager(); | 1271 CreateAudioManager(); |
| 1272 } | 1272 } |
| 1273 | 1273 |
| 1274 { | 1274 { |
| 1275 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); | 1275 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); |
| 1276 midi_manager_.reset(media::midi::MidiManager::Create()); | 1276 midi_manager_.reset(media::midi::MidiManager::Create()); |
| 1277 } | 1277 } |
| 1278 | 1278 |
| 1279 #if defined(OS_WIN) | 1279 #if defined(OS_WIN) |
| 1280 system_message_window_.reset(new media::SystemMessageWindowWin); | 1280 system_message_window_.reset(new device::SystemMessageWindowWin); |
| 1281 #elif defined(OS_LINUX) && defined(USE_UDEV) | 1281 #elif defined(OS_LINUX) && defined(USE_UDEV) |
| 1282 device_monitor_linux_.reset( | 1282 device_monitor_linux_.reset( |
| 1283 new media::DeviceMonitorLinux(io_thread_->task_runner())); | 1283 new device::DeviceMonitorUdev(io_thread_->task_runner())); |
| 1284 #elif defined(OS_MACOSX) | 1284 #elif defined(OS_MACOSX) |
| 1285 device_monitor_mac_.reset(new media::DeviceMonitorMac()); | 1285 device_monitor_mac_.reset(new device::DeviceMonitorMac()); |
| 1286 #endif | 1286 #endif |
| 1287 | 1287 |
| 1288 #if defined(OS_WIN) | 1288 #if defined(OS_WIN) |
| 1289 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", | 1289 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", |
| 1290 IsWin32kRendererLockdownEnabled()); | 1290 IsWin32kRendererLockdownEnabled()); |
| 1291 #endif | 1291 #endif |
| 1292 | 1292 |
| 1293 // RDH needs the IO thread to be created | 1293 // RDH needs the IO thread to be created |
| 1294 { | 1294 { |
| 1295 TRACE_EVENT0("startup", | 1295 TRACE_EVENT0("startup", |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1517 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1517 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1518 audio_thread_->task_runner(); | 1518 audio_thread_->task_runner(); |
| 1519 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1519 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1520 std::move(worker_task_runner), | 1520 std::move(worker_task_runner), |
| 1521 MediaInternals::GetInstance()); | 1521 MediaInternals::GetInstance()); |
| 1522 } | 1522 } |
| 1523 CHECK(audio_manager_); | 1523 CHECK(audio_manager_); |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 } // namespace content | 1526 } // namespace content |
| OLD | NEW |