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 87fcb2a6c934ba93745107a19ee0417236f7cf5b..05d32ecae7fc35fa03653d11f5a794a7f76f5acb 100644 |
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc |
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc |
@@ -41,6 +41,7 @@ |
#include "content/public/common/media_stream_request.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension.h" |
+#include "extensions/common/permissions/permissions_data.h" |
#include "grit/generated_resources.h" |
#include "media/audio/audio_manager_base.h" |
#include "media/base/media_switches.h" |
@@ -550,14 +551,16 @@ void MediaCaptureDevicesDispatcher::ProcessTabCaptureAccessRequest( |
if (request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE && |
tab_capture_allowed && |
- extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) { |
+ extension->permissions_data()->HasAPIPermission( |
+ extensions::APIPermission::kTabCapture)) { |
devices.push_back(content::MediaStreamDevice( |
content::MEDIA_TAB_AUDIO_CAPTURE, std::string(), std::string())); |
} |
if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE && |
tab_capture_allowed && |
- extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) { |
+ extension->permissions_data()->HasAPIPermission( |
+ extensions::APIPermission::kTabCapture)) { |
devices.push_back(content::MediaStreamDevice( |
content::MEDIA_TAB_VIDEO_CAPTURE, std::string(), std::string())); |
} |
@@ -585,12 +588,14 @@ void MediaCaptureDevicesDispatcher:: |
Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
if (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE && |
- extension->HasAPIPermission(extensions::APIPermission::kAudioCapture)) { |
+ extension->permissions_data()->HasAPIPermission( |
+ extensions::APIPermission::kAudioCapture)) { |
GetDefaultDevicesForProfile(profile, true, false, &devices); |
} |
if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE && |
- extension->HasAPIPermission(extensions::APIPermission::kVideoCapture)) { |
+ extension->permissions_data()->HasAPIPermission( |
+ extensions::APIPermission::kVideoCapture)) { |
GetDefaultDevicesForProfile(profile, false, true, &devices); |
} |