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

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

Issue 2184823007: Add a feature which, when enabled, blocks permissions after X prompt dismissals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improve test Created 4 years, 5 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_util.cc
diff --git a/chrome/browser/permissions/permission_util.cc b/chrome/browser/permissions/permission_util.cc
index 776a92bee6dbb562259ffdcb29058b825f87209b..84409e915f74ab3436ebec97733955a8d0cebe85 100644
--- a/chrome/browser/permissions/permission_util.cc
+++ b/chrome/browser/permissions/permission_util.cc
@@ -4,11 +4,90 @@
#include "chrome/browser/permissions/permission_util.h"
+#include <memory>
+
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/permissions/permission_uma_util.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/variations/variations_associated_data.h"
#include "content/public/browser/permission_type.h"
+#include "url/gurl.h"
+
+namespace {
+
+// The number of times that users may explicitly dismiss a permission prompt
+// from an origin before it is automatically blocked. Configurable via Finch,
+// and only used if features::kBlockPromptsIfDismissedOften is enabled.
+int gPromptDismissalsBeforeBlock = 3;
kcarattini 2016/07/28 08:54:49 This value isn't used unless it's been updated fro
dominickn 2016/08/01 01:08:51 This is now a static constant - it's the default v
+
+bool gUpdatedFromVariations = false;
raymes 2016/07/28 08:07:50 nit: globals tend to use camel case with a g_ pref
kcarattini 2016/07/28 08:54:49 Isn't it lowercase with underscores?
dominickn 2016/08/01 01:08:51 Now a constant not a global.
+
+const char kPromptStudyName[] = "PermissionPromptsUX";
+const char kPromptDismissCountKey[] = "dismiss_count";
+
+std::unique_ptr<base::DictionaryValue> GetOriginDict(
+ HostContentSettingsMap* settings,
+ const GURL& origin_url) {
+ if (!settings)
+ return base::WrapUnique(new base::DictionaryValue());
+
+ std::unique_ptr<base::DictionaryValue> dict =
+ base::DictionaryValue::From(settings->GetWebsiteSetting(
+ origin_url, origin_url,
+ CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, std::string(),
+ nullptr));
+ if (!dict)
+ return base::WrapUnique(new base::DictionaryValue());
+
+ return dict;
+}
+
+base::DictionaryValue* GetPermissionDict(base::DictionaryValue* origin_dict,
+ const std::string& permission) {
+ base::DictionaryValue* permission_dict = nullptr;
+ if (!origin_dict->GetDictionaryWithoutPathExpansion(permission,
+ &permission_dict)) {
+ permission_dict = new base::DictionaryValue();
+ origin_dict->SetWithoutPathExpansion(permission,
+ base::WrapUnique(permission_dict));
+ }
+
+ return permission_dict;
+}
+
+// Records that the user dismissed a permission prompt for type |permission|
+// on |url| to a website setting. Returns the updated number of dismissals.
+int RecordDismissalCount(Profile* profile,
+ const GURL& url,
+ content::PermissionType permission) {
+ HostContentSettingsMap* map =
+ HostContentSettingsMapFactory::GetForProfile(profile);
+ std::unique_ptr<base::DictionaryValue> dict = GetOriginDict(map, url);
+ if (!dict.get())
+ return 0;
+
+ base::DictionaryValue* permission_dict = GetPermissionDict(
+ dict.get(), PermissionUtil::GetPermissionString(permission));
+
+ if (!permission_dict)
+ return 0;
+
+ int current_count = 0;
+ permission_dict->GetInteger(kPromptDismissCountKey, &current_count);
+ permission_dict->SetInteger(kPromptDismissCountKey, ++current_count);
+
+ map->SetWebsiteSettingDefaultScope(
+ url, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
+ std::string(), std::move(dict));
+
+ return current_count;
+}
+
+} // anonymous namespace
using content::PermissionType;
@@ -131,3 +210,25 @@ PermissionUtil::ScopedRevocationReporter::~ScopedRevocationReporter() {
}
}
}
+
+bool PermissionUtil::ShouldChangeDismissalToBlock(
+ Profile* profile,
+ const GURL& url,
+ content::PermissionType permission) {
+ int current_dismissal_count = RecordDismissalCount(profile, url, permission);
kcarattini 2016/07/28 08:54:49 So this count is kept forever, is that correct? It
dominickn 2016/08/01 01:08:51 I think that keeping the count forever is correct.
+
+ if (!base::FeatureList::IsEnabled(features::kBlockPromptsIfDismissedOften))
+ return false;
+
+ if (!gUpdatedFromVariations) {
+ int prompt_dismissals = -1;
+ std::string value = variations::GetVariationParamValue(
+ kPromptStudyName, kPromptDismissCountKey);
+ if (base::StringToInt(value, &prompt_dismissals) && prompt_dismissals > 0)
+ gPromptDismissalsBeforeBlock = prompt_dismissals;
+
+ gUpdatedFromVariations = true;
+ }
+
+ return current_dismissal_count >= gPromptDismissalsBeforeBlock;
+}
raymes 2016/07/28 08:07:50 nit: suggestion: since there is a reasonable amoun
dominickn 2016/08/01 01:08:51 Done. Naming is hard, please let me know if you ha

Powered by Google App Engine
This is Rietveld 408576698