| Index: chrome/browser/ssl/ssl_policy_backend.cc
|
| ===================================================================
|
| --- chrome/browser/ssl/ssl_policy_backend.cc (revision 47323)
|
| +++ chrome/browser/ssl/ssl_policy_backend.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -11,7 +11,6 @@
|
| #include "chrome/browser/tab_contents/navigation_controller.h"
|
| #include "chrome/browser/tab_contents/navigation_entry.h"
|
| #include "chrome/browser/tab_contents/tab_contents.h"
|
| -#include "chrome/common/notification_service.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/theme_resources.h"
|
|
|
| @@ -103,14 +102,15 @@
|
| }
|
| }
|
|
|
| -void SSLPolicyBackend::MarkHostAsBroken(const std::string& host, int id) {
|
| - ssl_host_state_->MarkHostAsBroken(host, id);
|
| - DispatchSSLInternalStateChanged();
|
| +void SSLPolicyBackend::HostRanInsecureContent(const std::string& host,
|
| + int id) {
|
| + ssl_host_state_->HostRanInsecureContent(host, id);
|
| + SSLManager::NotifySSLInternalStateChanged();
|
| }
|
|
|
| -bool SSLPolicyBackend::DidMarkHostAsBroken(const std::string& host,
|
| - int pid) const {
|
| - return ssl_host_state_->DidMarkHostAsBroken(host, pid);
|
| +bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host,
|
| + int pid) const {
|
| + return ssl_host_state_->DidHostRunInsecureContent(host, pid);
|
| }
|
|
|
| void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert,
|
| @@ -128,13 +128,6 @@
|
| return ssl_host_state_->QueryPolicy(cert, host);
|
| }
|
|
|
| -void SSLPolicyBackend::DispatchSSLInternalStateChanged() {
|
| - NotificationService::current()->Notify(
|
| - NotificationType::SSL_INTERNAL_STATE_CHANGED,
|
| - Source<NavigationController>(controller_),
|
| - NotificationService::NoDetails());
|
| -}
|
| -
|
| void SSLPolicyBackend::ShowPendingMessages() {
|
| std::vector<SSLMessageInfo>::const_iterator iter;
|
| for (iter = pending_messages_.begin();
|
|
|