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

Unified Diff: components/content_settings/core/browser/cookie_settings.cc

Issue 1229933007: Make quota logic obey durable storage permission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3_top_durable
Patch Set: fix extensions_browsertests compile Created 5 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: components/content_settings/core/browser/cookie_settings.cc
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 94ffb397dbc038bdb7fe030bc796ca53ac631cdc..7c82a4e48f33c1df1d9e3322ba4e0ab7a17122ef 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -75,6 +75,7 @@ bool CookieSettings::IsCookieSessionOnly(const GURL& origin) const {
void CookieSettings::GetCookieSettings(
ContentSettingsForOneType* settings) const {
+ // TODO(dgrogan): Why is this returning a value in a void function?
return host_content_settings_map_->GetSettingsForOneType(
CONTENT_SETTINGS_TYPE_COOKIES, std::string(), settings);
}
@@ -113,6 +114,17 @@ void CookieSettings::ResetCookieSetting(
std::string(), CONTENT_SETTING_DEFAULT);
}
+bool CookieSettings::IsStorageDurable(const GURL& origin) const {
+ // TODO(dgrogan): DCHECK somewhere that secondary doesn't get set for DURABLE.
+ // TODO(dgrogan): Should "resource_identifier" be something other than
+ // std::string()?
+ ContentSetting setting = host_content_settings_map_->GetContentSetting(
+ origin /*primary*/, origin /*secondary*/,
+ CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
+ std::string() /*resource_identifier*/);
+ return setting == CONTENT_SETTING_ALLOW;
+}
+
void CookieSettings::ShutdownOnUIThread() {
DCHECK(thread_checker_.CalledOnValidThread());
pref_change_registrar_.RemoveAll();
« no previous file with comments | « components/content_settings/core/browser/cookie_settings.h ('k') | content/browser/quota/quota_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698