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

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 10826089: Allow chrome://* to always include cookies in secure XHRs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 13922947547ace369e3cefce5fdc343696214c6e..39be5d4c43fbc864e6638b84743ec8be7603e6d3 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -497,6 +497,11 @@ bool HostContentSettingsMap::ShouldAllowAllContent(
content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
return false;
}
+ if (secondary_url.SchemeIs(chrome::kChromeUIScheme) &&
+ content_type == CONTENT_SETTINGS_TYPE_COOKIES &&
+ primary_url.SchemeIsSecure()) {
+ return true;
+ }
if (primary_url.SchemeIs(chrome::kExtensionScheme)) {
return content_type != CONTENT_SETTINGS_TYPE_PLUGINS &&
(content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698