Index: content/browser/browser_main_loop.h |
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h |
index 7b2879f70e469d2f4db7a31e60dd6f744a62cceb..eec1597ca1510750b145e56eefb4b7699c35e920 100644 |
--- a/content/browser/browser_main_loop.h |
+++ b/content/browser/browser_main_loop.h |
@@ -25,6 +25,7 @@ class TraceMemoryController; |
namespace media { |
class AudioManager; |
+class KeyPressMonitor; |
class MIDIManager; |
} // namespace media |
@@ -86,6 +87,9 @@ class CONTENT_EXPORT BrowserMainLoop { |
MediaStreamManager* media_stream_manager() const { |
return media_stream_manager_.get(); |
} |
+ media::KeyPressMonitor* key_press_monitor() const { |
+ return key_press_monitor_.get(); |
+ } |
media::MIDIManager* midi_manager() const { return midi_manager_.get(); } |
base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } |
@@ -122,6 +126,8 @@ class CONTENT_EXPORT BrowserMainLoop { |
scoped_ptr<base::PowerMonitor> power_monitor_; |
scoped_ptr<base::HighResolutionTimerManager> hi_res_timer_manager_; |
scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; |
+ // key_press_monitor_ has to outlive audio_manager_, so declared first. |
+ scoped_ptr<media::KeyPressMonitor> key_press_monitor_; |
scoped_ptr<media::AudioManager> audio_manager_; |
scoped_ptr<media::MIDIManager> midi_manager_; |
scoped_ptr<AudioMirroringManager> audio_mirroring_manager_; |