Index: content/browser/browser_main_loop.h |
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h |
index bae07bceab3b904fadbaebdef1a012dba2c0e623..3116f7572c6d49db59945bd2eadb0358529e4fe3 100644 |
--- a/content/browser/browser_main_loop.h |
+++ b/content/browser/browser_main_loop.h |
@@ -31,8 +31,10 @@ class TraceEventSystemStatsMonitor; |
namespace media { |
class AudioManager; |
-class MidiManager; |
class UserInputMonitor; |
+namespace midi { |
+class MidiManager; |
+} // namespace midi |
} // namespace media |
namespace net { |
@@ -102,7 +104,7 @@ class CONTENT_EXPORT BrowserMainLoop { |
media::UserInputMonitor* user_input_monitor() const { |
return user_input_monitor_.get(); |
} |
- media::MidiManager* midi_manager() const { return midi_manager_.get(); } |
+ media::midi::MidiManager* midi_manager() const { return midi_manager_.get(); } |
base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } |
bool is_tracing_startup() const { return is_tracing_startup_; } |
@@ -163,7 +165,7 @@ class CONTENT_EXPORT BrowserMainLoop { |
// user_input_monitor_ has to outlive audio_manager_, so declared first. |
scoped_ptr<media::UserInputMonitor> user_input_monitor_; |
scoped_ptr<media::AudioManager> audio_manager_; |
- scoped_ptr<media::MidiManager> midi_manager_; |
+ scoped_ptr<media::midi::MidiManager> midi_manager_; |
scoped_ptr<MediaStreamManager> media_stream_manager_; |
// Per-process listener for online state changes. |
scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; |