| Index: chrome/browser/media/media_stream_device_permission_context.h
|
| diff --git a/chrome/browser/media/media_stream_device_permission_context.h b/chrome/browser/media/media_stream_device_permission_context.h
|
| index 6e6b3f5b6aa6b3ee3380e8f584add87fee543344..6d63888c6bd75e1498836f93e78b6f84441e76d6 100644
|
| --- a/chrome/browser/media/media_stream_device_permission_context.h
|
| +++ b/chrome/browser/media/media_stream_device_permission_context.h
|
| @@ -33,6 +33,13 @@ class MediaStreamDevicePermissionContext : public PermissionContextBase {
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) const override;
|
|
|
| + // For Pepper request, insecure origins are allowed to be persisted, hence we
|
| + // can't just call GetPermissionStatus when the requesting origin is insecure.
|
| + // Please see crbug.com/512301.
|
| + ContentSetting GetPermissionStatusForPepper(
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin) const;
|
| +
|
| void ResetPermission(const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
|
|
| @@ -40,6 +47,10 @@ class MediaStreamDevicePermissionContext : public PermissionContextBase {
|
| const PermissionRequestID& id) override;
|
|
|
| private:
|
| + ContentSetting GetPermissionStatusInternal(const GURL& requesting_origin,
|
| + const GURL& embedding_origin,
|
| + bool is_pepper_request) const;
|
| +
|
| // PermissionContextBase:
|
| bool IsRestrictedToSecureOrigins() const override;
|
|
|
|
|