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

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

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: AudioManager injection into MediaStreamManager, consistent enum naming; per wjia@ comments. Also, … Created 8 years, 3 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_stream_capture_indicator.cc
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc
index 4bedce6a01adead9e48646dd5a32c836a22a7ac0..0232806ec058c1bb3ec1834590c6ce2eb849369c 100644
--- a/chrome/browser/media/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/media_stream_capture_indicator.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/i18n/rtl.h"
+#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
@@ -19,6 +20,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/media_stream_request.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -402,14 +404,14 @@ void MediaStreamCaptureIndicator::AddCaptureDeviceTab(
bool video = false;
content::MediaStreamDevices::const_iterator dev = devices.begin();
for (; dev != devices.end(); ++dev) {
- DCHECK(dev->type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE ||
- dev->type == content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
- if (dev->type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) {
+ if (content::IsAudioMediaType(dev->type)) {
++iter->audio_ref_count;
audio = true;
- } else {
+ } else if (content::IsVideoMediaType(dev->type)) {
++iter->video_ref_count;
video = true;
+ } else {
+ NOTIMPLEMENTED();
}
}
@@ -429,12 +431,13 @@ void MediaStreamCaptureIndicator::RemoveCaptureDeviceTab(
if (iter != tabs_.end()) {
content::MediaStreamDevices::const_iterator dev = devices.begin();
for (; dev != devices.end(); ++dev) {
- DCHECK(dev->type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE ||
- dev->type == content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
- if (dev->type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE)
+ if (content::IsAudioMediaType(dev->type)) {
--iter->audio_ref_count;
- else
+ } else if (content::IsVideoMediaType(dev->type)) {
--iter->video_ref_count;
+ } else {
+ NOTIMPLEMENTED();
+ }
DCHECK_GE(iter->audio_ref_count, 0);
DCHECK_GE(iter->video_ref_count, 0);

Powered by Google App Engine
This is Rietveld 408576698