Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Unified Diff: content/browser/browser_main_loop.h

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments from patch 48 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/audio_modem/audio_recorder_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 70522111c06aa36ae49a42229c4b8b0ea1101b68..4d3444586bc9b1859f4943b15ebbe3c9c2dd0848 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -14,6 +14,7 @@
#include "build/build_config.h"
#include "content/browser/browser_process_sub_thread.h"
#include "content/public/browser/browser_main_runner.h"
+#include "media/audio/audio_manager.h"
#if defined(USE_AURA)
namespace aura {
@@ -39,7 +40,6 @@ class ScopedIPCSupport;
}
namespace media {
-class AudioManager;
#if defined(OS_WIN)
class SystemMessageWindowWin;
#elif defined(OS_LINUX) && defined(USE_UDEV)
@@ -169,6 +169,7 @@ class CONTENT_EXPORT BrowserMainLoop {
void InitStartupTracingForDuration(const base::CommandLine& command_line);
void EndStartupTracing();
+ void CreateAudioManager();
bool UsingInProcessGpu() const;
// Quick reference for initialization order:
@@ -260,7 +261,9 @@ class CONTENT_EXPORT BrowserMainLoop {
// |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
- std::unique_ptr<media::AudioManager> audio_manager_;
+ // AudioThread needs to outlive |audio_manager_|.
+ std::unique_ptr<base::Thread> audio_thread_;
+ media::ScopedAudioManagerPtr audio_manager_;
std::unique_ptr<media::midi::MidiManager> midi_manager_;
« no previous file with comments | « components/audio_modem/audio_recorder_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698