components/content_settings/core/browser/host_content_settings_map.cc - Issue 1099453005: Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure().

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: Address jww's comments. 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 74076c5d77eac8e0065ccb5550162e3b6dd298dd..79b882cb3bfe5e2529101ff59b20661a13c7eb10 100644

--- a/components/content_settings/core/browser/host_content_settings_map.cc

+++ b/components/content_settings/core/browser/host_content_settings_map.cc

@@ -13,6 +13,7 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/time/clock.h"

+#include "chrome/common/origin_util.h"

#include "components/content_settings/core/browser/content_settings_default_provider.h"

#include "components/content_settings/core/browser/content_settings_details.h"

#include "components/content_settings/core/browser/content_settings_observable_provider.h"

@@ -654,7 +655,7 @@ bool HostContentSettingsMap::ShouldAllowAllContent(

#endif

if (secondary_url.SchemeIs(kChromeUIScheme) &&

content_type == CONTENT_SETTINGS_TYPE_COOKIES &&

- primary_url.SchemeIsSecure()) {

+ IsOriginSecure(primary_url)) {

lgarron 2015/05/08 03:05:49 bauerb@: `git cl upload` complains: You added one

Bernhard Bauer 2015/05/08 09:06:31 The presubmit check is right, this is indeed *not*

return true;

}

#if defined(ENABLE_EXTENSIONS)

« chrome/browser/content_settings/permission_context_uma_util.cc ('K') | « components/content_settings/core/browser/DEPS ('k') | content/browser/DEPS » ('j') | no next file with comments »