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

Unified Diff: chrome/browser/media/protected_media_identifier_permission_context.cc

Issue 2586153002: Move kill switch and secure origin checking logic (Closed)
Patch Set: Move kill switch and secure origin checking logic Created 4 years 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/protected_media_identifier_permission_context.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 6d172d8ec341b1e3b38cd045f5222a133db2657c..ea8bd5c0a51277743fea01003de83f1258d4f994 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -83,9 +83,10 @@ void ProtectedMediaIdentifierPermissionContext::DecidePermission(
}
#endif // defined(OS_CHROMEOS)
-ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
- const GURL& requesting_origin,
- const GURL& embedding_origin) const {
+ContentSetting
+ProtectedMediaIdentifierPermissionContext::GetPermissionStatusInternal(
+ const GURL& requesting_origin,
+ const GURL& embedding_origin) const {
DVLOG(1) << __func__ << ": (" << requesting_origin.spec() << ", "
<< embedding_origin.spec() << ")";
@@ -94,8 +95,9 @@ ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
return CONTENT_SETTING_BLOCK;
}
- ContentSetting content_setting = PermissionContextBase::GetPermissionStatus(
- requesting_origin, embedding_origin);
+ ContentSetting content_setting =
+ PermissionContextBase::GetPermissionStatusInternal(requesting_origin,
+ embedding_origin);
DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
content_setting == CONTENT_SETTING_BLOCK ||
content_setting == CONTENT_SETTING_ASK);

Powered by Google App Engine
This is Rietveld 408576698