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

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

Issue 2418493002: //media/midi: use top level namespace midi rather than media.midi (Closed)
Patch Set: TAG name change s/media_midi/midi/ Created 4 years, 2 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
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/media/midi_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 nullptr); 1281 nullptr);
1282 #endif 1282 #endif
1283 1283
1284 { 1284 {
1285 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); 1285 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");
1286 CreateAudioManager(); 1286 CreateAudioManager();
1287 } 1287 }
1288 1288
1289 { 1289 {
1290 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager"); 1290 TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
1291 midi_manager_.reset(media::midi::MidiManager::Create()); 1291 midi_manager_.reset(midi::MidiManager::Create());
1292 } 1292 }
1293 1293
1294 #if defined(OS_WIN) 1294 #if defined(OS_WIN)
1295 system_message_window_.reset(new media::SystemMessageWindowWin); 1295 system_message_window_.reset(new media::SystemMessageWindowWin);
1296 #elif defined(OS_LINUX) && defined(USE_UDEV) 1296 #elif defined(OS_LINUX) && defined(USE_UDEV)
1297 device_monitor_linux_.reset( 1297 device_monitor_linux_.reset(
1298 new media::DeviceMonitorLinux(io_thread_->task_runner())); 1298 new media::DeviceMonitorLinux(io_thread_->task_runner()));
1299 #elif defined(OS_MACOSX) 1299 #elif defined(OS_MACOSX)
1300 device_monitor_mac_.reset(new media::DeviceMonitorMac()); 1300 device_monitor_mac_.reset(new media::DeviceMonitorMac());
1301 #endif 1301 #endif
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1571 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1572 audio_thread_->task_runner(); 1572 audio_thread_->task_runner();
1573 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1573 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1574 std::move(worker_task_runner), 1574 std::move(worker_task_runner),
1575 MediaInternals::GetInstance()); 1575 MediaInternals::GetInstance());
1576 } 1576 }
1577 CHECK(audio_manager_); 1577 CHECK(audio_manager_);
1578 } 1578 }
1579 1579
1580 } // namespace content 1580 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/media/midi_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698