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

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

Issue 1024563005: media: Remove kRAConsentGranted pref. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only 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.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 84b42b0c6bac894fddceb5ef6e1d43c1efc61a38..d002fdfd4186c3fbe995cebf2fd2ff9b701101ce 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -29,6 +29,10 @@
#error This file currently only supports Chrome OS and Android.
#endif
+#if defined(OS_CHROMEOS)
+using chromeos::attestation::PlatformVerificationDialog;
+#endif
+
ProtectedMediaIdentifierPermissionContext::
ProtectedMediaIdentifierPermissionContext(Profile* profile)
: PermissionContextBase(profile,
@@ -44,18 +48,6 @@ ProtectedMediaIdentifierPermissionContext::
~ProtectedMediaIdentifierPermissionContext() {
}
-#if defined(OS_CHROMEOS)
-using chromeos::attestation::PlatformVerificationDialog;
-
-// static
-void ProtectedMediaIdentifierPermissionContext::RegisterProfilePrefs(
- user_prefs::PrefRegistrySyncable* prefs) {
- prefs->RegisterBooleanPref(prefs::kRAConsentGranted,
- false, // Default value.
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-#endif
-
void ProtectedMediaIdentifierPermissionContext::RequestPermission(
content::WebContents* web_contents,
const PermissionRequestID& id,
@@ -127,15 +119,7 @@ ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
content_setting == CONTENT_SETTING_BLOCK ||
content_setting == CONTENT_SETTING_ASK);
-#if defined(OS_CHROMEOS)
- // Check kRAConsentGranted here because it's possible that user dismissed
- // the dialog triggered by RequestPermission() and the content setting is
- // set to "allow" by server sync. In this case, we should still "ask".
- if (content_setting == CONTENT_SETTING_ALLOW &&
- !profile()->GetPrefs()->GetBoolean(prefs::kRAConsentGranted)) {
- content_setting = CONTENT_SETTING_ASK;
- }
-#elif defined(OS_ANDROID)
+#if defined(OS_ANDROID)
// When kDisableInfobarForProtectedMediaIdentifier is enabled, do not "ask"
// the user and always "allow".
if (content_setting == CONTENT_SETTING_ASK &&
@@ -221,16 +205,6 @@ bool ProtectedMediaIdentifierPermissionContext::
}
#if defined(OS_CHROMEOS)
-static void RecordRAConsentGranted(content::WebContents* web_contents) {
- PrefService* pref_service =
- user_prefs::UserPrefs::Get(web_contents->GetBrowserContext());
- if (!pref_service) {
- LOG(ERROR) << "Failed to get user prefs.";
- return;
- }
- pref_service->SetBoolean(prefs::kRAConsentGranted, true);
-}
-
void ProtectedMediaIdentifierPermissionContext::
OnPlatformVerificationConsentResponse(
content::WebContents* web_contents,
@@ -258,7 +232,6 @@ void ProtectedMediaIdentifierPermissionContext::
VLOG(1) << "Platform verification accepted by user.";
content::RecordAction(
base::UserMetricsAction("PlatformVerificationAccepted"));
- RecordRAConsentGranted(web_contents);
content_setting = CONTENT_SETTING_ALLOW;
persist = true;
break;
« no previous file with comments | « chrome/browser/media/protected_media_identifier_permission_context.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698