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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Change WalletServiceUrl::IsSignInContinueUrl to use SchemeIsCryptographic. Created 5 years, 7 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

« chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('K') | « components/autofill/content/browser/wallet/wallet_service_url_unittest.cc ('k') | content/browser/appcache/appcache_update_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

#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)