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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 11573066: Add a method to tab_utils.h to find out whether a tab is playing audio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 7 years, 10 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 | « chrome/browser/media/media_capture_devices_dispatcher.h ('k') | chrome/browser/ui/tabs/tab_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index f1d616534a113312ccd9546d6c3cf81021fd4688..7b2e6939d6761e26b5c3f8bc3ad4959a60363c0e 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "base/prefs/pref_service.h"
+#include "chrome/browser/media/audio_stream_indicator.h"
#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -44,7 +45,8 @@ MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
: devices_enumerated_(false),
- media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {}
+ media_stream_capture_indicator_(new MediaStreamCaptureIndicator()),
+ audio_stream_indicator_(new AudioStreamIndicator()) {}
MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
@@ -149,6 +151,11 @@ scoped_refptr<MediaStreamCaptureIndicator>
return media_stream_capture_indicator_;
}
+scoped_refptr<AudioStreamIndicator>
+MediaCaptureDevicesDispatcher::GetAudioStreamIndicator() {
+ return audio_stream_indicator_;
+}
+
void MediaCaptureDevicesDispatcher::OnCaptureDevicesOpened(
int render_process_id,
int render_view_id,
@@ -202,6 +209,14 @@ void MediaCaptureDevicesDispatcher::OnMediaRequestStateChanged(
}
+void MediaCaptureDevicesDispatcher::OnAudioStreamPlayingChanged(
+ int render_process_id, int render_view_id, int stream_id, bool playing) {
+ audio_stream_indicator_->UpdateWebContentsStatus(render_process_id,
+ render_view_id,
+ stream_id,
+ playing);
+}
+
void MediaCaptureDevicesDispatcher::UpdateAudioDevicesOnUIThread(
const content::MediaStreamDevices& devices) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.h ('k') | chrome/browser/ui/tabs/tab_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698