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 89374b5fa2194d2ef70e5e90ef0a4533933c64bf..61117f173efbc79edf88ec68875f7774d1a33b90 100644 |
--- a/chrome/browser/ui/extensions/shell_window.cc |
+++ b/chrome/browser/ui/extensions/shell_window.cc |
@@ -39,6 +39,7 @@ |
#include "content/public/browser/site_instance.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_intents_dispatcher.h" |
+#include "content/public/common/media_stream_request.h" |
#include "content/public/common/renderer_preferences.h" |
using content::BrowserThread; |
@@ -188,19 +189,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::IsAudioMediaType(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::IsVideoMediaType(it->first) && |
+ extension()->HasAPIPermission(APIPermission::kVideoCapture) && |
+ !it->second.empty()) { |
+ devices.push_back(it->second.front()); |
+ accepted_a_video_device = true; |
+ } |
} |
callback.Run(devices); |
@@ -427,4 +435,3 @@ void ShellWindow::SaveWindowPosition() |
gfx::Rect bounds = native_window_->GetBounds(); |
cache->SaveGeometry(extension()->id(), window_key_, bounds); |
} |
- |