Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Side by Side Diff: content/browser/ssl/ssl_policy_backend.cc

Issue 469003004: Revert "Add button to page info to revoke user certificate decisions." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/ssl/ssl_policy_backend.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/ssl/ssl_policy_backend.h" 5 #include "content/browser/ssl/ssl_policy_backend.h"
6 6
7 #include "content/browser/frame_host/navigation_controller_impl.h" 7 #include "content/browser/frame_host/navigation_controller_impl.h"
8 #include "content/browser/ssl/ssl_host_state.h"
8 #include "content/public/browser/browser_context.h" 9 #include "content/public/browser/browser_context.h"
9 #include "content/public/browser/ssl_host_state_delegate.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 SSLPolicyBackend::SSLPolicyBackend(NavigationControllerImpl* controller) 13 SSLPolicyBackend::SSLPolicyBackend(NavigationControllerImpl* controller)
14 : ssl_host_state_delegate_( 14 : ssl_host_state_(SSLHostState::GetFor(controller->GetBrowserContext())),
15 controller->GetBrowserContext()->GetSSLHostStateDelegate()),
16 controller_(controller) { 15 controller_(controller) {
17 DCHECK(controller_); 16 DCHECK(controller_);
18 } 17 }
19 18
20 void SSLPolicyBackend::HostRanInsecureContent(const std::string& host, int id) { 19 void SSLPolicyBackend::HostRanInsecureContent(const std::string& host, int id) {
21 if (ssl_host_state_delegate_) 20 ssl_host_state_->HostRanInsecureContent(host, id);
22 ssl_host_state_delegate_->HostRanInsecureContent(host, id);
23 SSLManager::NotifySSLInternalStateChanged(controller_->GetBrowserContext()); 21 SSLManager::NotifySSLInternalStateChanged(controller_->GetBrowserContext());
24 } 22 }
25 23
26 bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host, 24 bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host,
27 int pid) const { 25 int pid) const {
28 if (!ssl_host_state_delegate_) 26 return ssl_host_state_->DidHostRunInsecureContent(host, pid);
29 return false;
30
31 return ssl_host_state_delegate_->DidHostRunInsecureContent(host, pid);
32 } 27 }
33 28
34 void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert, 29 void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert,
35 const std::string& host, 30 const std::string& host,
36 net::CertStatus error) { 31 net::CertStatus error) {
37 if (ssl_host_state_delegate_) 32 ssl_host_state_->DenyCertForHost(cert, host, error);
38 ssl_host_state_delegate_->DenyCert(host, cert, error);
39 } 33 }
40 34
41 void SSLPolicyBackend::AllowCertForHost(net::X509Certificate* cert, 35 void SSLPolicyBackend::AllowCertForHost(net::X509Certificate* cert,
42 const std::string& host, 36 const std::string& host,
43 net::CertStatus error) { 37 net::CertStatus error) {
44 if (ssl_host_state_delegate_) 38 ssl_host_state_->AllowCertForHost(cert, host, error);
45 ssl_host_state_delegate_->AllowCert(host, cert, error);
46 } 39 }
47 40
48 net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy( 41 net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy(
49 net::X509Certificate* cert, 42 net::X509Certificate* cert,
50 const std::string& host, 43 const std::string& host,
51 net::CertStatus error) { 44 net::CertStatus error) {
52 if (!ssl_host_state_delegate_) 45 return ssl_host_state_->QueryPolicy(cert, host, error);
53 return net::CertPolicy::UNKNOWN;
54
55 return ssl_host_state_delegate_->QueryPolicy(host, cert, error);
56 } 46 }
57 47
58 } // namespace content 48 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_policy_backend.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698