| Index: chrome/browser/media/webrtc/media_stream_device_permission_context.cc
|
| diff --git a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
|
| index 80b05a5242889fe973e06e23d525b107b72cbbcf..d755b6d4977807a9d21c4ffcf1f0439da063b7af 100644
|
| --- a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
|
| +++ b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
|
| @@ -3,8 +3,10 @@
|
| // found in the LICENSE file.
|
|
|
| #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h"
|
| +#include "base/command_line.h"
|
| #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| @@ -22,14 +24,18 @@ MediaStreamDevicePermissionContext::MediaStreamDevicePermissionContext(
|
|
|
| MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {}
|
|
|
| -void MediaStreamDevicePermissionContext::RequestPermission(
|
| +void MediaStreamDevicePermissionContext::DecidePermission(
|
| content::WebContents* web_contents,
|
| const PermissionRequestID& id,
|
| - const GURL& requesting_frame,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin,
|
| bool user_gesture,
|
| const BrowserPermissionCallback& callback) {
|
| - NOTREACHED() << "RequestPermission is not implemented";
|
| - callback.Run(CONTENT_SETTING_BLOCK);
|
| + DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableGroupedMediaPermissionPrompts));
|
| + PermissionContextBase::DecidePermission(web_contents, id, requesting_origin,
|
| + embedding_origin, user_gesture,
|
| + callback);
|
| }
|
|
|
| ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
|
|
|