| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 56d8549a41cd985ee3057693b9864415522704e1..b5cf9000fbaa2e04858ef01e47e8af44ee1eaf1e 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -47,6 +47,7 @@
|
| #include "crypto/nss_util.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "media/base/media.h"
|
| +#include "media/midi/midi_manager.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/socket/client_socket_factory.h"
|
| #include "net/ssl/ssl_config_service.h"
|
| @@ -268,6 +269,10 @@ media::AudioManager* BrowserMainLoop::GetAudioManager() {
|
| return g_current_browser_main_loop->audio_manager_.get();
|
| }
|
|
|
| +media::MIDIManager* BrowserMainLoop::GetMIDIManager() {
|
| + return g_current_browser_main_loop->midi_manager_.get();
|
| +}
|
| +
|
| // static
|
| AudioMirroringManager* BrowserMainLoop::GetAudioMirroringManager() {
|
| return g_current_browser_main_loop->audio_mirroring_manager_.get();
|
| @@ -396,7 +401,10 @@ void BrowserMainLoop::MainMessageLoopStart() {
|
| TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
|
| audio_manager_.reset(media::AudioManager::Create());
|
| }
|
| -
|
| + {
|
| + TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
|
| + midi_manager_.reset(media::MIDIManager::Create());
|
| + }
|
|
|
| #if !defined(OS_IOS)
|
| {
|
|
|