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

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

Issue 10168008: Show camera and microphone status indicators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Tommi's comments, displayed the title of the tab on the tray icon menu Created 8 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
Index: chrome/browser/media/media_internals.cc
diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc
index 156428344f0c3575e6ee8c14ccc2e40aa2849e7a..df4d5bb54b008a85639af80fd9a62c13ac287c06 100644
--- a/chrome/browser/media/media_internals.cc
+++ b/chrome/browser/media/media_internals.cc
@@ -8,6 +8,7 @@
#include "base/string16.h"
#include "base/stringprintf.h"
#include "chrome/browser/media/media_internals_observer.h"
+#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_ui.h"
#include "media/base/media_log.h"
@@ -63,6 +64,29 @@ void MediaInternals::OnMediaEvent(
SendUpdate("media.onMediaEvent", &dict);
}
+void MediaInternals::OnCaptureDevicesOpened(
+ int render_process_id,
+ int render_view_id,
+ const content::MediaStreamDevices& devices) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ if (!media_stream_capture_indicator_.get())
+ media_stream_capture_indicator_ = new MediaStreamCaptureIndicator();
+ media_stream_capture_indicator_->CaptureDevicesOpened(render_process_id,
+ render_view_id,
+ devices);
+}
+
+void MediaInternals::OnCaptureDevicesClosed(
+ int render_process_id,
+ int render_view_id,
+ const content::MediaStreamDevices& devices) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK(media_stream_capture_indicator_.get());
tommi (sloooow) - chröme 2012/05/02 12:10:55 this dcheck isn't very useful since you deref the
tommi (sloooow) - chröme 2012/05/02 12:10:55 no need for this dcheck
no longer working on chromium 2012/05/02 13:24:29 Done.
no longer working on chromium 2012/05/02 13:24:29 Done.
+ media_stream_capture_indicator_->CaptureDevicesClosed(render_process_id,
+ render_view_id,
+ devices);
+}
+
void MediaInternals::AddObserver(MediaInternalsObserver* observer) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
observers_.AddObserver(observer);

Powered by Google App Engine
This is Rietveld 408576698