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

Unified Diff: content/browser/ssl/ssl_policy.cc

Issue 1101173004: Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: content/browser/ssl/ssl_policy.cc
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 5a627fb484e068be42d45eb0a4796d712edcf3c4..9cb80cd3c6b12e248c70df89d6d5b42a375c7df5 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -143,7 +143,7 @@ void SSLPolicy::UpdateEntry(NavigationEntryImpl* entry,
InitializeEntryIfNeeded(entry);
- if (!entry->GetURL().SchemeIsSecure())
+ if (!entry->GetURL().SchemeIsCryptographic())
return;
if (!web_contents->DisplayedInsecureContent())
@@ -251,13 +251,14 @@ void SSLPolicy::InitializeEntryIfNeeded(NavigationEntryImpl* entry) {
if (entry->GetSSL().security_style != SECURITY_STYLE_UNKNOWN)
return;
- entry->GetSSL().security_style = entry->GetURL().SchemeIsSecure() ?
- SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED;
+ entry->GetSSL().security_style = entry->GetURL().SchemeIsCryptographic()
+ ? SECURITY_STYLE_AUTHENTICATED
+ : SECURITY_STYLE_UNAUTHENTICATED;
}
void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
GURL parsed_origin(origin);
- if (parsed_origin.SchemeIsSecure())
+ if (parsed_origin.SchemeIsCryptographic())
backend_->HostRanInsecureContent(parsed_origin.host(), pid);
}
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | extensions/browser/updater/extension_downloader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698