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

Unified Diff: chrome/browser/ui/extensions/shell_window.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: Created 8 years, 4 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/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index da858acec0c294be43baf41133ee3a0245abfac7..ef11308151d5d548346e3bf8d0bb864f1bf11591 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -152,19 +152,26 @@ void ShellWindow::RequestMediaAccessPermission(
const content::MediaResponseCallback& callback) {
content::MediaStreamDevices devices;
- content::MediaStreamDeviceMap::const_iterator iter =
- request->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE);
- if (iter != request->devices.end() &&
- extension()->HasAPIPermission(APIPermission::kAudioCapture) &&
- !iter->second.empty()) {
- devices.push_back(iter->second[0]);
- }
-
- iter = request->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
- if (iter != request->devices.end() &&
- extension()->HasAPIPermission(APIPermission::kVideoCapture) &&
- !iter->second.empty()) {
- devices.push_back(iter->second[0]);
+ // Auto-accept the first audio device and the first video device from the
+ // request when the appropriate API permissions exist.
+ bool accepted_an_audio_device = false;
+ bool accepted_a_video_device = false;
+ for (content::MediaStreamDeviceMap::const_iterator it =
+ request->devices.begin();
+ it != request->devices.end(); ++it) {
+ if (!accepted_an_audio_device &&
+ content::IsAudioMediaStreamDeviceType(it->first) &&
+ extension()->HasAPIPermission(APIPermission::kAudioCapture) &&
+ !it->second.empty()) {
+ devices.push_back(it->second.front());
+ accepted_an_audio_device = true;
+ } else if (!accepted_a_video_device &&
+ content::IsVideoMediaStreamDeviceType(it->first) &&
+ extension()->HasAPIPermission(APIPermission::kVideoCapture) &&
+ !it->second.empty()) {
+ devices.push_back(it->second.front());
+ accepted_a_video_device = true;
+ }
}
callback.Run(devices);

Powered by Google App Engine
This is Rietveld 408576698