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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Made ResourceContext::audio_manager() abide the same rules as other accessors Created 9 years 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
« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/speech/chrome_speech_input_manager.h » ('j') | chrome/browser/speech/speech_input_bubble_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
===================================================================
--- chrome/browser/profiles/profile_io_data.cc (revision 113173)
+++ chrome/browser/profiles/profile_io_data.cc (working copy)
@@ -496,7 +496,8 @@
job_factory_->AddInterceptor(new chromeos::GViewRequestInterceptor);
#endif // defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD)
- media_stream_manager_.reset(new media_stream::MediaStreamManager);
+ media_stream_manager_.reset(
+ new media_stream::MediaStreamManager(g_browser_process->audio_manager()));
// Take ownership over these parameters.
database_tracker_ = profile_params_->database_tracker;
@@ -523,6 +524,7 @@
io_thread_globals->media.media_internals.get());
resource_context_.set_download_id_factory(download_id_factory_);
resource_context_.set_media_stream_manager(media_stream_manager_.get());
+ resource_context_.set_audio_manager(g_browser_process->audio_manager());
LazyInitializeInternal(profile_params_.get());
« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/speech/chrome_speech_input_manager.h » ('j') | chrome/browser/speech/speech_input_bubble_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698