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

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

Issue 1099453005: Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto the moved version of IsOriginSecure (https://codereview.chromium.org/1101033003/). Created 5 years, 8 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/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 73dd8092522d551c2e54174778fde2ba5aec46ad..3a4b2cbcf346588ee766f5202357abd3e72d0d70 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -24,6 +24,7 @@
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
+#include "content/public/common/origin_util.h"
lgarron 2015/04/27 23:21:53 `git cl upload` complains: You added one or more
#include "net/base/net_errors.h"
#include "net/base/static_cookie_policy.h"
#include "url/gurl.h"
@@ -659,7 +660,7 @@ bool HostContentSettingsMap::ShouldAllowAllContent(
#endif
if (secondary_url.SchemeIs(kChromeUIScheme) &&
content_type == CONTENT_SETTINGS_TYPE_COOKIES &&
- primary_url.SchemeIsSecure()) {
+ IsOriginSecure(primary_url)) {
return true;
}
#if defined(ENABLE_EXTENSIONS)

Powered by Google App Engine
This is Rietveld 408576698