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

Unified Diff: content/renderer/render_thread.cc

Issue 7157001: Implements AudioMessageFilter as member in RenderThread (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Added TODO() comment in failing unit test Created 9 years, 6 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
Index: content/renderer/render_thread.cc
===================================================================
--- content/renderer/render_thread.cc (revision 90030)
+++ content/renderer/render_thread.cc (working copy)
@@ -37,6 +37,7 @@
#include "content/renderer/gpu/gpu_channel_host.h"
#include "content/renderer/gpu/gpu_video_service_host.h"
#include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/media/audio_message_filter.h"
#include "content/renderer/media/video_capture_message_filter.h"
#include "content/renderer/media/video_capture_message_filter_creator.h"
#include "content/renderer/plugin_channel_host.h"
@@ -173,6 +174,9 @@
VideoCaptureMessageFilterCreator::SharedFilter();
AddFilter(video_capture_message_filter);
+ audio_message_filter_ = new AudioMessageFilter();
+ AddFilter(audio_message_filter_.get());
+
content::GetContentClient()->renderer()->RenderThreadStarted();
TRACE_EVENT_END_ETW("RenderThread::Init", 0, "");
@@ -187,13 +191,16 @@
web_database_observer_impl_->WaitForAllDatabasesToClose();
// Shutdown in reverse of the initialization order.
- RemoveFilter(db_message_filter_.get());
- db_message_filter_ = NULL;
+ RemoveFilter(audio_message_filter_.get());
+ audio_message_filter_ = NULL;
VideoCaptureMessageFilter* video_capture_message_filter =
- VideoCaptureMessageFilterCreator::SharedFilter();
+ VideoCaptureMessageFilterCreator::SharedFilter();
scherkus (not reviewing) 2011/06/23 19:14:43 nit: 4 space indent
henrika_dont_use 2011/06/27 15:05:44 Done.
RemoveFilter(video_capture_message_filter);
+ RemoveFilter(db_message_filter_.get());
+ db_message_filter_ = NULL;
+
// Shutdown the file thread if it's running.
if (file_thread_.get())
file_thread_->Stop();

Powered by Google App Engine
This is Rietveld 408576698