| Index: content/browser/browser_main_loop.h
|
| diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
|
| index 0a9e387eef262c50034e9ef9233651f5be02b106..2b798bf85d5a033941dd7927b4d3ce8bff879d01 100644
|
| --- a/content/browser/browser_main_loop.h
|
| +++ b/content/browser/browser_main_loop.h
|
| @@ -33,8 +33,10 @@ class TraceEventSystemStatsMonitor;
|
|
|
| namespace media {
|
| class AudioManager;
|
| -class MidiManager;
|
| class UserInputMonitor;
|
| +namespace midi {
|
| +class MidiManager;
|
| +} // namespace midi
|
| } // namespace media
|
|
|
| namespace net {
|
| @@ -104,7 +106,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_; }
|
| @@ -165,7 +167,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_;
|
|
|