chrome/common/chrome_content_client.cc - Issue 1072933006: Support whitelisting to handle insecure origins as trustworthy origins (chromium)

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: chrome/common/chrome_content_client.cc

Issue 1072933006: Support whitelisting to handle insecure origins as trustworthy origins (chromium) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added more tests 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: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 854f7e5a2cd9e276e75aa7c8dc920dafeb5a5a5c..bbefaa0ca59d34162a272759ddab58cf9e041b05 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -24,6 +24,7 @@

#include "chrome/common/crash_keys.h"

#include "chrome/common/pepper_flash.h"

#include "chrome/common/render_messages.h"

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

#include "chrome/common/url_constants.h"

#include "chrome/grit/common_resources.h"

#include "components/dom_distiller/core/url_constants.h"

@@ -558,7 +559,5 @@ void ChromeContentClient::AddSecureSchemesAndOrigins(

schemes->insert(content::kChromeUIScheme);

schemes->insert(extensions::kExtensionScheme);

schemes->insert(extensions::kExtensionResourceScheme);

- // TODO(kinuko): Handle command-line options for whitelisting

- // insecure origins. crbug.com/441605

+ GetSecureOriginWhitelist(origins);

}

« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »