summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl_manager.cc
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 19:40:37 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 19:40:37 +0000
commit8ac1a75acadaa2aae065212cb6255d00c789a184 (patch)
tree854eaf66ba8ce7e581bd8e6f1fa75f46d22f4bb7 /chrome/browser/ssl_manager.cc
parent287a019ed5d015185cab41f6c7156dc6c4cbcee7 (diff)
downloadchromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.zip
chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.gz
chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.bz2
Move more net classes into the net namespace. Also remove the net_util namespace in favor of the net namespace.
This is a purely mechanical change. There should be no logic changes. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl_manager.cc')
-rw-r--r--chrome/browser/ssl_manager.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ssl_manager.cc b/chrome/browser/ssl_manager.cc
index c15436d..0e9b16a 100644
--- a/chrome/browser/ssl_manager.cc
+++ b/chrome/browser/ssl_manager.cc
@@ -266,7 +266,7 @@ void SSLManager::AddMessageToConsole(const std::wstring& msg,
// Delegate API method.
-void SSLManager::DenyCertForHost(X509Certificate* cert,
+void SSLManager::DenyCertForHost(net::X509Certificate* cert,
const std::string& host) {
// Remember that we don't like this cert for this host.
// TODO(abarth): Do we want to persist this information in the user's profile?
@@ -274,7 +274,7 @@ void SSLManager::DenyCertForHost(X509Certificate* cert,
}
// Delegate API method.
-void SSLManager::AllowCertForHost(X509Certificate* cert,
+void SSLManager::AllowCertForHost(net::X509Certificate* cert,
const std::string& host) {
// Remember that we do like this cert for this host.
// TODO(abarth): Do we want to persist this information in the user's profile?
@@ -282,8 +282,8 @@ void SSLManager::AllowCertForHost(X509Certificate* cert,
}
// Delegate API method.
-X509Certificate::Policy::Judgment SSLManager::QueryPolicy(
- X509Certificate* cert, const std::string& host) {
+net::X509Certificate::Policy::Judgment SSLManager::QueryPolicy(
+ net::X509Certificate* cert, const std::string& host) {
// TODO(abarth): Do we want to read this information from the user's profile?
return cert_policy_for_host_[host].Check(cert);
}
@@ -512,7 +512,7 @@ SSLManager::CertError::CertError(
URLRequest* request,
ResourceType::Type resource_type,
int cert_error,
- X509Certificate* cert,
+ net::X509Certificate* cert,
MessageLoop* ui_loop)
: ErrorHandler(rdh, request, ui_loop),
cert_error_(cert_error),
@@ -529,7 +529,7 @@ SSLManager::CertError::CertError(
void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
URLRequest* request,
int cert_error,
- X509Certificate* cert,
+ net::X509Certificate* cert,
MessageLoop* ui_loop) {
DLOG(INFO) << "OnSSLCertificateError() cert_error: " << cert_error <<
" url: " << request->url().spec();
@@ -751,7 +751,7 @@ bool SSLManager::DeserializeSecurityInfo(const std::string& state,
}
// static
-bool SSLManager::GetEVCertNames(const X509Certificate& cert,
+bool SSLManager::GetEVCertNames(const net::X509Certificate& cert,
std::wstring* short_name,
std::wstring* ca_name) {
DCHECK(short_name || ca_name);