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

Unified Diff: chrome/browser/media/media_stream_device_permission_context.h

Issue 1318173002: Integrate MediaPermission with PermissionManager by using PermissionContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/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..eb9e4120d3dd772c83c81b42c13dd796ed261dcd 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 origin is allowed to be persisted, hence we
raymes 2015/09/02 04:15:33 insecure origins are allowed to be persisted
guoweis_left_chromium 2015/09/02 05:54:11 Done.
+ // can't just ask for permission when the requesting origin is insecure. See
raymes 2015/09/02 04:15:33 can't just call GetPermissionStatus when the reque
guoweis_left_chromium 2015/09/02 05:54:11 Done.
+ // 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;

Powered by Google App Engine
This is Rietveld 408576698