summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl/ssl_policy.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ssl/ssl_policy.h')
-rw-r--r--chrome/browser/ssl/ssl_policy.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_policy.h b/chrome/browser/ssl/ssl_policy.h
index b61861d..9318143 100644
--- a/chrome/browser/ssl/ssl_policy.h
+++ b/chrome/browser/ssl/ssl_policy.h
@@ -41,6 +41,12 @@ class SSLPolicy : public SSLManager::Delegate,
int ssl_cert_status);
virtual SecurityStyle GetDefaultStyle(const GURL& url);
+ // This method is static because it is called from both the UI and the IO
+ // threads.
+ static bool IsMixedContent(const GURL& url,
+ ResourceType::Type resource_type,
+ const std::string& main_frame_origin);
+
// SSLBlockingPage::Delegate methods.
virtual SSLErrorInfo GetSSLErrorInfo(SSLManager::CertError* error);
virtual void OnDenyCertificate(SSLManager::CertError* error);