| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1109 BrowserGpuMemoryBufferManager::current(), io_thread_->task_runner()); | 1109 BrowserGpuMemoryBufferManager::current(), io_thread_->task_runner()); |
| 1110 | 1110 |
| 1111 { | 1111 { |
| 1112 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); | 1112 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); |
| 1113 audio_manager_.reset(media::AudioManager::CreateWithHangTimer( | 1113 audio_manager_.reset(media::AudioManager::CreateWithHangTimer( |
| 1114 MediaInternals::GetInstance(), io_thread_->task_runner())); | 1114 MediaInternals::GetInstance(), io_thread_->task_runner())); |
| 1115 } | 1115 } |
| 1116 | 1116 |
| 1117 { | 1117 { |
| 1118 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); | 1118 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); |
| 1119 midi_manager_.reset(media::MidiManager::Create()); | 1119 midi_manager_.reset(media::midi::MidiManager::Create()); |
| 1120 } | 1120 } |
| 1121 | 1121 |
| 1122 #if defined(OS_LINUX) && defined(USE_UDEV) | 1122 #if defined(OS_LINUX) && defined(USE_UDEV) |
| 1123 device_monitor_linux_.reset(new DeviceMonitorLinux()); | 1123 device_monitor_linux_.reset(new DeviceMonitorLinux()); |
| 1124 #elif defined(OS_MACOSX) | 1124 #elif defined(OS_MACOSX) |
| 1125 device_monitor_mac_.reset(new DeviceMonitorMac()); | 1125 device_monitor_mac_.reset(new DeviceMonitorMac()); |
| 1126 #endif | 1126 #endif |
| 1127 | 1127 |
| 1128 #if defined(OS_WIN) | 1128 #if defined(OS_WIN) |
| 1129 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", | 1129 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1310 | 1310 |
| 1311 void BrowserMainLoop::EndStartupTracing() { | 1311 void BrowserMainLoop::EndStartupTracing() { |
| 1312 is_tracing_startup_ = false; | 1312 is_tracing_startup_ = false; |
| 1313 TracingController::GetInstance()->DisableRecording( | 1313 TracingController::GetInstance()->DisableRecording( |
| 1314 TracingController::CreateFileSink( | 1314 TracingController::CreateFileSink( |
| 1315 startup_trace_file_, | 1315 startup_trace_file_, |
| 1316 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1316 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1317 } | 1317 } |
| 1318 | 1318 |
| 1319 } // namespace content | 1319 } // namespace content |
| OLD | NEW |