summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 21:00:23 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 21:00:23 +0000
commite24b70c4852ca81ac9719942d82bc753256904d7 (patch)
treee2bff96244c560ba95bf0ef86e9bde71f7a5841f /chrome/common
parentef77dc138e27f5f143589a4c27ca760e0ac2d079 (diff)
downloadchromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.zip
chromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.tar.gz
chromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.tar.bz2
Reapply of Tony's r9656 (Add chrome/browser/ssl/ssl_manager.cc to the build.)
Also port 2 more files in browser/ssl to posix * ssl_policy * ssl_blocking_page Review URL: http://codereview.chromium.org/21297 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc14
-rw-r--r--chrome/common/temp_scaffolding_stubs.h39
2 files changed, 11 insertions, 42 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index e64785d..46d7a78 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -376,20 +376,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*) {
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index def13b1..51e0cc4 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"
@@ -617,7 +619,16 @@ class TabContentsDelegate {
class InterstitialPage {
public:
+ InterstitialPage(WebContents* tab, bool new_navigation, const GURL& url) {
+ NOTIMPLEMENTED();
+ }
virtual void DontProceed() { NOTIMPLEMENTED(); }
+ virtual void Proceed() { NOTIMPLEMENTED(); }
+ virtual void Show() { NOTIMPLEMENTED(); }
+ WebContents* tab() const {
+ NOTIMPLEMENTED();
+ return NULL;
+ }
};
class InfoBarDelegate {
@@ -973,34 +984,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&,