diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 16:45:32 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 16:45:32 +0000 |
commit | 34591ebee0bdd1f1062c0f340b53641f10280f54 (patch) | |
tree | 0a083de4d2b3a152261417be386ea6f46e221673 /chrome/common | |
parent | 60b52141dfcaa58a09d388431f496d8adb92b79a (diff) | |
download | chromium_src-34591ebee0bdd1f1062c0f340b53641f10280f54.zip chromium_src-34591ebee0bdd1f1062c0f340b53641f10280f54.tar.gz chromium_src-34591ebee0bdd1f1062c0f340b53641f10280f54.tar.bz2 |
Add chrome/browser/ssl/ssl_manager.cc to the build.
Review URL: http://codereview.chromium.org/21275
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 19 | ||||
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 93 |
2 files changed, 70 insertions, 42 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 8d6eb8a..3ca2278 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -339,20 +339,6 @@ void RunBeforeUnloadDialog(WebContents* web_contents, NOTIMPLEMENTED(); } -bool SSLManager::DeserializeSecurityInfo(const std::string&, int*, int*, int*) { - NOTIMPLEMENTED(); - return false; -} - -void SSLManager::OnSSLCertificateError( - ResourceDispatcherHost* resource_dispatcher, - URLRequest* request, - int cert_error, - net::X509Certificate* cert, - MessageLoop* ui_loop) { - NOTIMPLEMENTED(); -} - //-------------------------------------------------------------------------- void RunRepostFormWarningDialog(NavigationController*) { @@ -430,6 +416,11 @@ void DebuggerShell::ProcessCommand(const std::wstring& data) { } #endif // !CHROME_DEBUGGER_DISABLED +SSLPolicy* SSLPolicy::GetDefaultPolicy() { + NOTIMPLEMENTED(); + return NULL; +} + void HistoryURLProvider::ExecuteWithDB(history::HistoryBackend*, history::URLDatabase*, HistoryURLProviderParams*) { diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 1f17cc9..c6b9f28 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -32,6 +32,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/sessions/session_id.h" +#include "chrome/browser/ssl/ssl_error_info.h" +#include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents_type.h" @@ -981,34 +983,6 @@ class ConstrainedWindow { void CloseConstrainedWindow() { NOTIMPLEMENTED(); } }; -class SSLManager { - public: - class Delegate { - public: - }; - SSLManager(NavigationController* controller, Delegate* delegate) { - NOTIMPLEMENTED(); - } - ~SSLManager() { } - void NavigationStateChanged() { NOTIMPLEMENTED(); } - static bool DeserializeSecurityInfo(const std::string&, int*, int*, int*); - static void OnSSLCertificateError(ResourceDispatcherHost* rdh, - URLRequest* request, - int cert_error, - net::X509Certificate* cert, - MessageLoop* ui_loop); - static std::string SerializeSecurityInfo(int cert_id, - int cert_status, - int security_bits) { - NOTIMPLEMENTED(); - return std::string(); - } - static void OnMixedContentRequest(ResourceDispatcherHost* rdh, - URLRequest* request, - MessageLoop* ui_loop) { NOTIMPLEMENTED(); } - void OnMixedContent(MixedContentHandler* mixed_content) { NOTIMPLEMENTED(); } -}; - class ModalHtmlDialogDelegate { public: ModalHtmlDialogDelegate(const GURL&, int, int, const std::string&, @@ -1074,4 +1048,67 @@ class RepostFormWarningDialog { virtual ~RepostFormWarningDialog() { } }; +class SSLBlockingPage : public InterstitialPage { + public: + class Delegate { + public: + virtual SSLErrorInfo GetSSLErrorInfo(SSLManager::CertError* error) = 0; + virtual void OnDenyCertificate(SSLManager::CertError* error) = 0; + virtual void OnAllowCertificate(SSLManager::CertError* error) = 0; + }; + + SSLBlockingPage(SSLManager::CertError* error, Delegate* delegate); + virtual ~SSLBlockingPage(); + + static void SetExtraInfo(DictionaryValue* strings, + const std::vector<std::wstring>& extra_info); + + protected: + virtual std::string GetHTMLContents(); + virtual void CommandReceived(const std::string& command); + virtual void UpdateEntry(NavigationEntry* entry); + virtual void Proceed(); + virtual void DontProceed(); + + private: + void NotifyDenyCertificate(); + void NotifyAllowCertificate(); + + DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); +}; + +class SSLPolicy : public SSLManager::Delegate, + public SSLBlockingPage::Delegate { + public: + static SSLPolicy* GetDefaultPolicy(); + + virtual void OnCertError(const GURL& main_frame_url, + SSLManager::CertError* error); + virtual void OnMixedContent( + NavigationController* navigation_controller, + const GURL& main_frame_url, + SSLManager::MixedContentHandler* mixed_content_handler) { + } + + virtual void OnRequestStarted(SSLManager* manager, + const GURL& url, + ResourceType::Type resource_type, + int ssl_cert_id, + int ssl_cert_status); + virtual SecurityStyle GetDefaultStyle(const GURL& url); + + virtual SSLErrorInfo GetSSLErrorInfo(SSLManager::CertError* error); + virtual void OnDenyCertificate(SSLManager::CertError* error); + virtual void OnAllowCertificate(SSLManager::CertError* error); + + protected: + SSLPolicy(); + void OnOverridableCertError(const GURL& main_frame_url, + SSLManager::CertError* error); + void OnFatalCertError(const GURL& main_frame_url, + SSLManager::CertError* error); + private: + DISALLOW_EVIL_CONSTRUCTORS(SSLPolicy); +}; + #endif // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_ |