diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 09:18:06 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 09:18:06 +0000 |
| commit | c46b0e667387bb42a18be86e8b1f85e968902953 (patch) | |
| tree | 801ddb204b400e25ecd3fe1211584e5b5519e93e /chrome/browser/ssl/ssl_policy.h | |
| parent | ffc45869f044885b81265e6a67cb0220758113b5 (diff) | |
| download | chromium_src-c46b0e667387bb42a18be86e8b1f85e968902953.zip chromium_src-c46b0e667387bb42a18be86e8b1f85e968902953.tar.gz chromium_src-c46b0e667387bb42a18be86e8b1f85e968902953.tar.bz2 | |
SSLPolicy Fix: Step 3.
Plumbing the security origin of the frame making the request to SSL land.
R=wtc
BUG=8706
Review URL: http://codereview.chromium.org/48038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_policy.h')
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.h | 6 |
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); |