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

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

Issue 1001723002: media: Refactor PlatformVerificationFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 9 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/protected_media_identifier_permission_context.h
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.h b/chrome/browser/media/protected_media_identifier_permission_context.h
index 4cc94f55d2beea10025b9de9975dea2da739e30c..d5b2139cc8a30853378360617ae26da0d7604bfc 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.h
+++ b/chrome/browser/media/protected_media_identifier_permission_context.h
@@ -27,6 +27,10 @@ class RenderViewHost;
class WebContents;
}
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
// Manages protected media identifier permissions flow, and delegates UI
// handling via PermissionQueueController.
class ProtectedMediaIdentifierPermissionContext
@@ -34,6 +38,10 @@ class ProtectedMediaIdentifierPermissionContext
public:
explicit ProtectedMediaIdentifierPermissionContext(Profile* profile);
+#if defined(OS_CHROMEOS)
+ static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* prefs);
+#endif
+
// In addition to the base class flow checks that it is only code from
// valid iframes. It also adds special logic when called through an extension.
void RequestPermission(content::WebContents* web_contents,
@@ -54,18 +62,20 @@ class ProtectedMediaIdentifierPermissionContext
const GURL& requesting_frame,
bool allowed) override;
- // Returns whether "Protected content" is enabled. It can be disabled by a
- // user in the master switch in content settings, or by the device policy.
+ // Returns whether "Protected content" is enabled based on factors other
+ // than the protected media identifier content setting itself. For example,
+ // it can be disabled by a master switch in content settings, in incognito or
+ // guest mode, or by the device policy.
bool IsProtectedMediaIdentifierEnabled() const;
#if defined(OS_CHROMEOS)
- void OnPlatformVerificationResult(
+ void OnPlatformVerificationConsentResponse(
content::WebContents* web_contents,
const PermissionRequestID& id,
const GURL& requesting_origin,
const GURL& embedding_origin,
const BrowserPermissionCallback& callback,
- chromeos::attestation::PlatformVerificationFlow::ConsentResponse
+ chromeos::attestation::PlatformVerificationDialog::ConsentResponse
response);
// |this| is shared among multiple WebContents, so we could receive multiple

Powered by Google App Engine
This is Rietveld 408576698