diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/content/browser/browser_main_loop.h | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/content/browser/browser_main_loop.h')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/content/browser/browser_main_loop.h b/chromium/content/browser/browser_main_loop.h index a307ed73aaa..8c535ff302d 100644 --- a/chromium/content/browser/browser_main_loop.h +++ b/chromium/content/browser/browser_main_loop.h @@ -40,6 +40,7 @@ class DiscardableSharedMemoryManager; } namespace media { +class AudioSystem; #if defined(OS_WIN) class SystemMessageWindowWin; #elif defined(OS_LINUX) && defined(USE_UDEV) @@ -137,6 +138,7 @@ class CONTENT_EXPORT BrowserMainLoop { int GetResultCode() const { return result_code_; } media::AudioManager* audio_manager() const { return audio_manager_.get(); } + media::AudioSystem* audio_system() const { return audio_system_.get(); } MediaStreamManager* media_stream_manager() const { return media_stream_manager_.get(); } @@ -295,6 +297,9 @@ class CONTENT_EXPORT BrowserMainLoop { // AudioThread needs to outlive |audio_manager_|. std::unique_ptr<AudioManagerThread> audio_thread_; media::ScopedAudioManagerPtr audio_manager_; + // Calls to |audio_system_| must not be posted to the audio thread if it + // differs from the UI one. + std::unique_ptr<media::AudioSystem> audio_system_; std::unique_ptr<midi::MidiService> midi_service_; |