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

Unified Diff: chrome/browser/permissions/permission_decision_auto_blocker.cc

Issue 2651123002: Migrate content setting PROMPT_NO_DECISION_COUNT to PERMISSION_AUTOBLOCKER_DATA (Closed)
Patch Set: . Created 3 years, 11 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/permissions/permission_decision_auto_blocker.cc
diff --git a/chrome/browser/permissions/permission_decision_auto_blocker.cc b/chrome/browser/permissions/permission_decision_auto_blocker.cc
index b38ee5edd010edea28f76564337c263b2f75c207..d08070dea9cafa988a2c8b5911119232eeb6342a 100644
--- a/chrome/browser/permissions/permission_decision_auto_blocker.cc
+++ b/chrome/browser/permissions/permission_decision_auto_blocker.cc
@@ -41,7 +41,7 @@ std::unique_ptr<base::DictionaryValue> GetOriginDict(
const GURL& origin_url) {
std::unique_ptr<base::DictionaryValue> dict =
base::DictionaryValue::From(settings->GetWebsiteSetting(
- origin_url, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ origin_url, GURL(), CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
std::string(), nullptr));
if (!dict)
return base::MakeUnique<base::DictionaryValue>();
@@ -79,7 +79,7 @@ int RecordActionInWebsiteSettings(const GURL& url,
permission_dict->SetInteger(key, ++current_count);
map->SetWebsiteSettingDefaultScope(
- url, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ url, GURL(), CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
std::string(), std::move(dict));
return current_count;
@@ -127,7 +127,7 @@ void PermissionDecisionAutoBlocker::RemoveCountsByUrl(
std::unique_ptr<ContentSettingsForOneType> settings(
new ContentSettingsForOneType);
- map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
std::string(), settings.get());
for (const auto& site : *settings) {
@@ -135,7 +135,7 @@ void PermissionDecisionAutoBlocker::RemoveCountsByUrl(
if (origin.is_valid() && filter.Run(origin)) {
map->SetWebsiteSettingDefaultScope(
- origin, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ origin, GURL(), CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
std::string(), nullptr);
}
}
@@ -309,7 +309,7 @@ void PermissionDecisionAutoBlocker::PlaceUnderEmbargo(
dict.get(), PermissionUtil::GetPermissionString(permission));
permission_dict->SetDouble(key, current_time.ToInternalValue());
map->SetWebsiteSettingDefaultScope(
- request_origin, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ request_origin, GURL(), CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
std::string(), std::move(dict));
}

Powered by Google App Engine
This is Rietveld 408576698