chrome/renderer/chrome_content_renderer_client.cc - Issue 1131493004: Switch //chrome functions to use SchemeIsCryptographic() 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: chrome/renderer/chrome_content_renderer_client.cc

Issue 1131493004: Switch //chrome functions to use SchemeIsCryptographic() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use inner URL for a filesystem calculation. 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

Index: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index 28164166aa42e47db4cd605fd3e50273bcd6b775..8e92dfcea4547c48ee1f72f33511004d7957dc43 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -1023,8 +1023,7 @@ bool ChromeContentRendererClient::IsNaClAllowed(

bool is_photo_app =

// Whitelisted apps must be served over https.

- app_url.SchemeIs("https") &&

- manifest_url.SchemeIs("https") &&

+ app_url.SchemeIsCryptographic() && manifest_url.SchemeIsCryptographic() &&

(EndsWith(app_url_host, "plus.google.com", false) ||

EndsWith(app_url_host, "plus.sandbox.google.com", false)) &&

manifest_url.DomainIs("ssl.gstatic.com") &&

@@ -1037,9 +1036,8 @@ bool ChromeContentRendererClient::IsNaClAllowed(

}

bool is_hangouts_app =

// Whitelisted apps must be served over secure scheme.

- app_url.SchemeIs("https") &&

- manifest_url.SchemeIsSecure() &&

- manifest_url.SchemeIsFileSystem() &&

+ app_url.SchemeIsCryptographic() && manifest_url.SchemeIsFileSystem() &&

+ manifest_url.inner_url()->SchemeIsCryptographic() &&

(EndsWith(app_url_host, "talkgadget.google.com", false) ||

EndsWith(app_url_host, "plus.google.com", false) ||

EndsWith(app_url_host, "plus.sandbox.google.com", false)) &&

« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_unittest.cc ('k') | no next file » | no next file with comments »