Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1086073004: Web MIDI: namespace change from media to media::midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@null
Patch Set: android build fix Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 #endif 1099 #endif
1100 1100
1101 { 1101 {
1102 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); 1102 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");
1103 audio_manager_.reset(media::AudioManager::CreateWithHangTimer( 1103 audio_manager_.reset(media::AudioManager::CreateWithHangTimer(
1104 MediaInternals::GetInstance(), io_thread_->task_runner())); 1104 MediaInternals::GetInstance(), io_thread_->task_runner()));
1105 } 1105 }
1106 1106
1107 { 1107 {
1108 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); 1108 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
1109 midi_manager_.reset(media::MidiManager::Create()); 1109 midi_manager_.reset(media::midi::MidiManager::Create());
1110 } 1110 }
1111 1111
1112 #if defined(OS_LINUX) && defined(USE_UDEV) 1112 #if defined(OS_LINUX) && defined(USE_UDEV)
1113 device_monitor_linux_.reset(new DeviceMonitorLinux()); 1113 device_monitor_linux_.reset(new DeviceMonitorLinux());
1114 #elif defined(OS_MACOSX) 1114 #elif defined(OS_MACOSX)
1115 device_monitor_mac_.reset(new DeviceMonitorMac()); 1115 device_monitor_mac_.reset(new DeviceMonitorMac());
1116 #endif 1116 #endif
1117 1117
1118 #if defined(OS_WIN) 1118 #if defined(OS_WIN)
1119 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", 1119 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown",
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 1300
1301 void BrowserMainLoop::EndStartupTracing() { 1301 void BrowserMainLoop::EndStartupTracing() {
1302 is_tracing_startup_ = false; 1302 is_tracing_startup_ = false;
1303 TracingController::GetInstance()->DisableRecording( 1303 TracingController::GetInstance()->DisableRecording(
1304 TracingController::CreateFileSink( 1304 TracingController::CreateFileSink(
1305 startup_trace_file_, 1305 startup_trace_file_,
1306 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1306 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1307 } 1307 }
1308 1308
1309 } // namespace content 1309 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698