diff options
| -rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_host_state.cc | 15 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_host_state.h | 9 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_host_state_unittest.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 33 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_manager.h | 12 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_mixed_content_handler.cc | 29 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_mixed_content_handler.h | 37 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 123 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.h | 28 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy_backend.cc | 34 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy_backend.h | 22 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
13 files changed, 18 insertions, 352 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index 1acecbc..60e42b9 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -1269,12 +1269,6 @@ void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) { GlobalRequestID global_id(info->child_id(), info->request_id()); pending_requests_[global_id] = request; - if (!SSLManager::ShouldStartRequest(this, request, ui_loop_)) { - // The SSLManager has told us that we shouldn't start the request yet. The - // SSLManager will potentially change the request (potentially to indicate - // its content should be filtered) and start it itself. - return; - } if (!user_script_listener_->ShouldStartRequest(request)) { // This request depends on some user scripts that haven't loaded yet. The // UserScriptListener will resume the request when they're ready. diff --git a/chrome/browser/ssl/ssl_host_state.cc b/chrome/browser/ssl/ssl_host_state.cc index 62bcb94..7e6d3cc 100644 --- a/chrome/browser/ssl/ssl_host_state.cc +++ b/chrome/browser/ssl/ssl_host_state.cc @@ -45,7 +45,6 @@ void SSLHostState::DenyCertForHost(net::X509Certificate* cert, const std::string& host) { DCHECK(CalledOnValidThread()); - // Remember that we don't like this cert for this host. cert_policy_for_host_[host].Deny(cert); } @@ -53,7 +52,6 @@ void SSLHostState::AllowCertForHost(net::X509Certificate* cert, const std::string& host) { DCHECK(CalledOnValidThread()); - // Remember that we do like this cert for this host. cert_policy_for_host_[host].Allow(cert); } @@ -63,16 +61,3 @@ net::X509Certificate::Policy::Judgment SSLHostState::QueryPolicy( return cert_policy_for_host_[host].Check(cert); } - -void SSLHostState::AllowMixedContentForHost(const std::string& host) { - DCHECK(CalledOnValidThread()); - - allow_mixed_content_for_host_.insert(host); -} - -bool SSLHostState::DidAllowMixedContentForHost(const std::string& host) { - DCHECK(CalledOnValidThread()); - - return (allow_mixed_content_for_host_.find(host) != - allow_mixed_content_for_host_.end()); -} diff --git a/chrome/browser/ssl/ssl_host_state.h b/chrome/browser/ssl/ssl_host_state.h index b42d8cf..5a8d774 100644 --- a/chrome/browser/ssl/ssl_host_state.h +++ b/chrome/browser/ssl/ssl_host_state.h @@ -46,12 +46,6 @@ class SSLHostState : public NonThreadSafe { net::X509Certificate::Policy::Judgment QueryPolicy( net::X509Certificate* cert, const std::string& host); - // Allows mixed content to be visible (non filtered). - void AllowMixedContentForHost(const std::string& host); - - // Returns whether the specified host is allowed to show mixed content. - bool DidAllowMixedContentForHost(const std::string& host); - private: // A BrokenHostEntry is a pair of (host, process_id) that indicates the host // contains insecure content in that renderer process. @@ -65,9 +59,6 @@ class SSLHostState : public NonThreadSafe { // Certificate policies for each host. std::map<std::string, net::X509Certificate::Policy> cert_policy_for_host_; - // Hosts for which we are allowed to show mixed content. - std::set<std::string> allow_mixed_content_for_host_; - DISALLOW_COPY_AND_ASSIGN(SSLHostState); }; diff --git a/chrome/browser/ssl/ssl_host_state_unittest.cc b/chrome/browser/ssl/ssl_host_state_unittest.cc index f88b45d..2a3db46 100644 --- a/chrome/browser/ssl/ssl_host_state_unittest.cc +++ b/chrome/browser/ssl/ssl_host_state_unittest.cc @@ -152,23 +152,3 @@ TEST_F(SSLHostStateTest, QueryPolicy) { EXPECT_EQ(state.QueryPolicy(google_cert.get(), "example.com"), net::X509Certificate::Policy::DENIED); } - -TEST_F(SSLHostStateTest, AllowMixedContentForHost) { - SSLHostState state; - - EXPECT_FALSE(state.DidAllowMixedContentForHost("www.google.com")); - EXPECT_FALSE(state.DidAllowMixedContentForHost("google.com")); - EXPECT_FALSE(state.DidAllowMixedContentForHost("example.com")); - - state.AllowMixedContentForHost("www.google.com"); - - EXPECT_TRUE(state.DidAllowMixedContentForHost("www.google.com")); - EXPECT_FALSE(state.DidAllowMixedContentForHost("google.com")); - EXPECT_FALSE(state.DidAllowMixedContentForHost("example.com")); - - state.AllowMixedContentForHost("example.com"); - - EXPECT_TRUE(state.DidAllowMixedContentForHost("www.google.com")); - EXPECT_FALSE(state.DidAllowMixedContentForHost("google.com")); - EXPECT_TRUE(state.DidAllowMixedContentForHost("example.com")); -} diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 36b4127..bb17023 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -10,7 +10,6 @@ #include "chrome/browser/net/url_request_tracking.h" #include "chrome/browser/renderer_host/resource_request_details.h" #include "chrome/browser/ssl/ssl_cert_error_handler.h" -#include "chrome/browser/ssl/ssl_mixed_content_handler.h" #include "chrome/browser/ssl/ssl_policy.h" #include "chrome/browser/ssl/ssl_request_info.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -92,36 +91,8 @@ void SSLManager::DidDisplayInsecureContent() { } void SSLManager::DidRunInsecureContent(const std::string& security_origin) { - policy()->DidRunInsecureContent(security_origin); -} - -// static -bool SSLManager::ShouldStartRequest(ResourceDispatcherHost* rdh, - URLRequest* request, - MessageLoop* ui_loop) { - ResourceDispatcherHostRequestInfo* info = - ResourceDispatcherHost::InfoForRequest(request); - DCHECK(info); - - // We cheat here and talk to the SSLPolicy on the IO thread because we need - // to respond synchronously to avoid delaying all network requests... - if (!SSLPolicy::IsMixedContent(request->url(), - info->resource_type(), - info->filter_policy(), - info->frame_origin())) - return true; - - - ui_loop->PostTask(FROM_HERE, - NewRunnableMethod(new SSLMixedContentHandler(rdh, - request, - info->resource_type(), - info->frame_origin(), - info->main_frame_origin(), - info->child_id(), - ui_loop), - &SSLMixedContentHandler::Dispatch)); - return false; + policy()->DidRunInsecureContent(controller_->GetActiveEntry(), + security_origin); } void SSLManager::Observe(NotificationType type, diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h index 4e96ce8..371248f 100644 --- a/chrome/browser/ssl/ssl_manager.h +++ b/chrome/browser/ssl/ssl_manager.h @@ -65,18 +65,6 @@ class SSLManager : public NotificationObserver { net::X509Certificate* cert, MessageLoop* ui_loop); - // Called before a URL request is about to be started. Returns false if the - // resource request should be delayed while we figure out what to do. We use - // this function as the entry point for our mixed content detection. - // - // TODO(jcampan): Implement a way to just cancel the request. This is not - // straight-forward as canceling a request that has not been started will - // not remove from the pending_requests_ of the ResourceDispatcherHost. - // Called on the IO thread. - static bool ShouldStartRequest(ResourceDispatcherHost* resource_dispatcher, - URLRequest* request, - MessageLoop* ui_loop); - // Mixed content entry points. void DidDisplayInsecureContent(); void DidRunInsecureContent(const std::string& security_origin); diff --git a/chrome/browser/ssl/ssl_mixed_content_handler.cc b/chrome/browser/ssl/ssl_mixed_content_handler.cc deleted file mode 100644 index 8faa259..0000000 --- a/chrome/browser/ssl/ssl_mixed_content_handler.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2009 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. - -#include "chrome/browser/ssl/ssl_mixed_content_handler.h" - -#include "chrome/browser/ssl/ssl_manager.h" -#include "chrome/browser/ssl/ssl_policy.h" - -SSLMixedContentHandler::SSLMixedContentHandler( - ResourceDispatcherHost* rdh, - URLRequest* request, - ResourceType::Type resource_type, - const std::string& frame_origin, - const std::string& main_frame_origin, - int pid, - MessageLoop* ui_loop) - : SSLErrorHandler(rdh, request, resource_type, frame_origin, - main_frame_origin, ui_loop), - pid_(pid) { -} - -void SSLMixedContentHandler::OnDispatchFailed() { - TakeNoAction(); -} - -void SSLMixedContentHandler::OnDispatched() { - manager_->policy()->OnMixedContent(this); -} diff --git a/chrome/browser/ssl/ssl_mixed_content_handler.h b/chrome/browser/ssl/ssl_mixed_content_handler.h deleted file mode 100644 index 0e47bb9..0000000 --- a/chrome/browser/ssl/ssl_mixed_content_handler.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2009 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. - -#ifndef CHROME_BROWSER_SSL_SSL_MIXED_CONTENT_HANDLER_H_ -#define CHROME_BROWSER_SSL_SSL_MIXED_CONTENT_HANDLER_H_ - -#include <string> - -#include "chrome/browser/ssl/ssl_error_handler.h" - -// The SSLMixedContentHandler class is used to query what to do with -// mixed content, from the IO thread to the UI thread. -class SSLMixedContentHandler : public SSLErrorHandler { - public: - // Created on the IO thread. - SSLMixedContentHandler(ResourceDispatcherHost* rdh, - URLRequest* request, - ResourceType::Type resource_type, - const std::string& frame_origin, - const std::string& main_frame_origin, - int pid, - MessageLoop* ui_loop); - - int pid() const { return pid_; } - - protected: - virtual void OnDispatchFailed(); - virtual void OnDispatched(); - - private: - int pid_; - - DISALLOW_COPY_AND_ASSIGN(SSLMixedContentHandler); -}; - -#endif // CHROME_BROWSER_SSL_SSL_MIXED_CONTENT_HANDLER_H_ diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index bdb571b..330ea27 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -16,7 +16,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ssl/ssl_cert_error_handler.h" #include "chrome/browser/ssl/ssl_error_info.h" -#include "chrome/browser/ssl/ssl_mixed_content_handler.h" #include "chrome/browser/ssl/ssl_request_info.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -35,35 +34,6 @@ using WebKit::WebConsoleMessage; -class SSLPolicy::ShowMixedContentTask : public Task { - public: - ShowMixedContentTask(SSLPolicy* policy, SSLMixedContentHandler* handler); - virtual ~ShowMixedContentTask(); - - virtual void Run(); - - private: - SSLPolicy* policy_; - scoped_refptr<SSLMixedContentHandler> handler_; - - DISALLOW_COPY_AND_ASSIGN(ShowMixedContentTask); -}; - -SSLPolicy::ShowMixedContentTask::ShowMixedContentTask(SSLPolicy* policy, - SSLMixedContentHandler* handler) - : policy_(policy), - handler_(handler) { -} - -SSLPolicy::ShowMixedContentTask::~ShowMixedContentTask() { -} - -void SSLPolicy::ShowMixedContentTask::Run() { - policy_->AllowMixedContentForOrigin(handler_->frame_origin()); - policy_->AllowMixedContentForOrigin(handler_->main_frame_origin()); - policy_->backend()->Reload(); -} - SSLPolicy::SSLPolicy(SSLPolicyBackend* backend) : backend_(backend) { DCHECK(backend_); @@ -113,48 +83,28 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) { } } -void SSLPolicy::OnMixedContent(SSLMixedContentHandler* handler) { - FilterPolicy::Type filter_policy = FilterPolicy::DONT_FILTER; - - // If the user has added an exception, doctor the |filter_policy|. - std::string host = GURL(handler->main_frame_origin()).host(); - if (backend_->DidAllowMixedContentForHost(host) || - backend_->DidMarkHostAsBroken(host, handler->pid())) { - // Let the mixed content through. - filter_policy = FilterPolicy::DONT_FILTER; - } else if (filter_policy != FilterPolicy::DONT_FILTER) { - backend_->ShowMessageWithLink( - l10n_util::GetString(IDS_SSL_INFO_BAR_FILTERED_CONTENT), - l10n_util::GetString(IDS_SSL_INFO_BAR_SHOW_CONTENT), - new ShowMixedContentTask(this, handler)); - } - - handler->StartRequest(filter_policy); - AddMixedContentWarningToConsole(handler); +void SSLPolicy::DidDisplayInsecureContent(NavigationEntry* entry) { + // TODO(abarth): We don't actually need to break the whole origin here, + // but we can handle that in a later patch. + DidRunInsecureContent(entry, entry->url().spec()); } -void SSLPolicy::DidDisplayInsecureContent(NavigationEntry* entry) { +void SSLPolicy::DidRunInsecureContent(NavigationEntry* entry, + const std::string& security_origin) { if (!entry) return; - // TODO(abarth): We don't actually need to break the whole origin here, - // but we can handle that in a later patch. - AllowMixedContentForOrigin(entry->url().spec()); -} + SiteInstance* site_instance = entry->site_instance(); + if (!site_instance) + return; -void SSLPolicy::DidRunInsecureContent(const std::string& security_origin) { - AllowMixedContentForOrigin(security_origin); + backend_->MarkHostAsBroken(GURL(security_origin).host(), + site_instance->GetProcess()->id()); } void SSLPolicy::OnRequestStarted(SSLRequestInfo* info) { if (net::IsCertStatusError(info->ssl_cert_status())) UpdateStateForUnsafeContent(info); - - if (IsMixedContent(info->url(), - info->resource_type(), - info->filter_policy(), - info->frame_origin())) - UpdateStateForMixedContent(info); } void SSLPolicy::UpdateEntry(NavigationEntry* entry) { @@ -188,36 +138,6 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry) { entry->ssl().set_has_mixed_content(); } -// static -bool SSLPolicy::IsMixedContent(const GURL& url, - ResourceType::Type resource_type, - FilterPolicy::Type filter_policy, - const std::string& frame_origin) { - //////////////////////////////////////////////////////////////////////////// - // WARNING: This function is called from both the IO and UI threads. Do // - // not touch any non-thread-safe objects! You have been warned. // - //////////////////////////////////////////////////////////////////////////// - - // We can't possibly have mixed content when loading the main frame. - if (resource_type == ResourceType::MAIN_FRAME) - return false; - - // If we've filtered the resource, then it's no longer dangerous. - if (filter_policy != FilterPolicy::DONT_FILTER) - return false; - - // If the frame doing the loading is already insecure, then we must have - // already dealt with whatever mixed content might be going on. - if (!GURL(frame_origin).SchemeIsSecure()) - return false; - - // We aren't worried about mixed content if we're loading an HTTPS URL. - if (url.SchemeIsSecure()) - return false; - - return true; -} - //////////////////////////////////////////////////////////////////////////////// // SSLBlockingPage::Delegate methods @@ -326,16 +246,6 @@ void SSLPolicy::ShowErrorPage(SSLCertErrorHandler* handler) { // along with the security_info. } -void SSLPolicy::AddMixedContentWarningToConsole( - SSLMixedContentHandler* handler) { - const std::wstring& text = l10n_util::GetStringF( - IDS_MIXED_CONTENT_LOG_MESSAGE, - UTF8ToWide(handler->frame_origin()), - UTF8ToWide(handler->request_url().spec())); - backend_->AddMessageToConsole( - WideToUTF16Hack(text), WebConsoleMessage::LevelWarning); -} - void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) { if (entry->ssl().security_style() != SECURITY_STYLE_UNKNOWN) return; @@ -352,15 +262,10 @@ void SSLPolicy::MarkOriginAsBroken(const std::string& origin, int pid) { backend_->MarkHostAsBroken(parsed_origin.host(), pid); } -void SSLPolicy::AllowMixedContentForOrigin(const std::string& origin) { - GURL parsed_origin(origin); - if (!parsed_origin.SchemeIsSecure()) - return; - - backend_->AllowMixedContentForHost(parsed_origin.host()); -} - void SSLPolicy::UpdateStateForMixedContent(SSLRequestInfo* info) { + // TODO(abarth): This function isn't right because we need to remove + // info->main_frame_origin(). + if (info->resource_type() != ResourceType::MAIN_FRAME || info->resource_type() != ResourceType::SUB_FRAME) { // The frame's origin now contains mixed content and therefore is broken. diff --git a/chrome/browser/ssl/ssl_policy.h b/chrome/browser/ssl/ssl_policy.h index df2e002..5a4b822 100644 --- a/chrome/browser/ssl/ssl_policy.h +++ b/chrome/browser/ssl/ssl_policy.h @@ -13,7 +13,6 @@ class NavigationEntry; class SSLCertErrorHandler; -class SSLMixedContentHandler; class SSLPolicyBackend; class SSLRequestInfo; @@ -30,15 +29,9 @@ class SSLPolicy : public SSLBlockingPage::Delegate { // An error occurred with the certificate in an SSL connection. void OnCertError(SSLCertErrorHandler* handler); - // TODO(abarth) Remove this API once the new mixed content path is done. - // - // A request for a mixed-content resource was made. Note that the resource - // request was not started yet and the delegate is responsible for starting - // it. - void OnMixedContent(SSLMixedContentHandler* handler); - void DidDisplayInsecureContent(NavigationEntry* entry); - void DidRunInsecureContent(const std::string& security_origin); + void DidRunInsecureContent(NavigationEntry* entry, + const std::string& security_origin); // We have started a resource request with the given info. void OnRequestStarted(SSLRequestInfo* info); @@ -46,13 +39,6 @@ class SSLPolicy : public SSLBlockingPage::Delegate { // Update the SSL information in |entry| to match the current state. void UpdateEntry(NavigationEntry* entry); - // This method is static because it is called from both the UI and the IO - // threads. - static bool IsMixedContent(const GURL& url, - ResourceType::Type resource_type, - FilterPolicy::Type filter_policy, - const std::string& frame_origin); - SSLPolicyBackend* backend() const { return backend_; } // SSLBlockingPage::Delegate methods. @@ -61,8 +47,6 @@ class SSLPolicy : public SSLBlockingPage::Delegate { virtual void OnAllowCertificate(SSLCertErrorHandler* handler); private: - class ShowMixedContentTask; - // Helper method for derived classes handling certificate errors that can be // overridden by the user. // Show a blocking page and let the user continue or cancel the request. @@ -76,10 +60,6 @@ class SSLPolicy : public SSLBlockingPage::Delegate { // give the user the opportunity to ingore the error. void ShowErrorPage(SSLCertErrorHandler* handler); - // Add a warning about mixed content to the JavaScript console. This warning - // helps web developers track down and eliminate mixed content on their site. - void AddMixedContentWarningToConsole(SSLMixedContentHandler* handler); - // If the security style of |entry| has not been initialized, then initialize // it with the default style for its URL. void InitializeEntryIfNeeded(NavigationEntry* entry); @@ -87,10 +67,6 @@ class SSLPolicy : public SSLBlockingPage::Delegate { // Mark |origin| as containing insecure content in the process with ID |pid|. void MarkOriginAsBroken(const std::string& origin, int pid); - // Allow |origin| to include mixed content. This stops us from showing an - // infobar warning after the user as approved mixed content. - void AllowMixedContentForOrigin(const std::string& origin); - // Called after we've decided that |info| represents a request for mixed // content. Updates our internal state to reflect that we've loaded |info|. void UpdateStateForMixedContent(SSLRequestInfo* info); diff --git a/chrome/browser/ssl/ssl_policy_backend.cc b/chrome/browser/ssl/ssl_policy_backend.cc index 310f3ba..d235165 100644 --- a/chrome/browser/ssl/ssl_policy_backend.cc +++ b/chrome/browser/ssl/ssl_policy_backend.cc @@ -105,26 +105,6 @@ void SSLPolicyBackend::ShowMessageWithLink(const std::wstring& msg, } } -bool SSLPolicyBackend::SetMaxSecurityStyle(SecurityStyle style) { - NavigationEntry* entry = controller_->GetActiveEntry(); - if (!entry) { - NOTREACHED(); - return false; - } - - if (entry->ssl().security_style() > style) { - entry->ssl().set_security_style(style); - return true; - } - return false; -} - -void SSLPolicyBackend::AddMessageToConsole( - const string16& message, const WebConsoleMessage::Level& level) { - controller_->tab_contents()->render_view_host()->AddMessageToConsole( - string16(), message, level); -} - void SSLPolicyBackend::MarkHostAsBroken(const std::string& host, int id) { ssl_host_state_->MarkHostAsBroken(host, id); DispatchSSLInternalStateChanged(); @@ -137,7 +117,6 @@ bool SSLPolicyBackend::DidMarkHostAsBroken(const std::string& host, void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert, const std::string& host) { - // Remember that we don't like this cert for this host. ssl_host_state_->DenyCertForHost(cert, host); } @@ -151,19 +130,6 @@ net::X509Certificate::Policy::Judgment SSLPolicyBackend::QueryPolicy( return ssl_host_state_->QueryPolicy(cert, host); } -void SSLPolicyBackend::AllowMixedContentForHost(const std::string& host) { - ssl_host_state_->AllowMixedContentForHost(host); -} - -bool SSLPolicyBackend::DidAllowMixedContentForHost( - const std::string& host) const { - return ssl_host_state_->DidAllowMixedContentForHost(host); -} - -void SSLPolicyBackend::Reload() { - controller_->Reload(true); -} - void SSLPolicyBackend::DispatchSSLInternalStateChanged() { NotificationService::current()->Notify( NotificationType::SSL_INTERNAL_STATE_CHANGED, diff --git a/chrome/browser/ssl/ssl_policy_backend.h b/chrome/browser/ssl/ssl_policy_backend.h index 935ad9e..9e86a6d 100644 --- a/chrome/browser/ssl/ssl_policy_backend.h +++ b/chrome/browser/ssl/ssl_policy_backend.h @@ -39,19 +39,6 @@ class SSLPolicyBackend { // Returns whether the specified host was marked as broken. bool DidMarkHostAsBroken(const std::string& host, int pid) const; - // Sets the maximum security style for the page. If the current security - // style is lower than |style|, this will not have an effect on the security - // indicators. - // - // It will return true if the navigation entry was updated or false if - // nothing changed. The caller is responsible for broadcasting - // NOTIFY_SSL_STATE_CHANGED if it returns true. - bool SetMaxSecurityStyle(SecurityStyle style); - - // Logs a message to the console of the page. - void AddMessageToConsole(const string16& message, - const WebKit::WebConsoleMessage::Level&); - // Records that |cert| is permitted to be used for |host| in the future. void DenyCertForHost(net::X509Certificate* cert, const std::string& host); @@ -62,15 +49,6 @@ class SSLPolicyBackend { net::X509Certificate::Policy::Judgment QueryPolicy( net::X509Certificate* cert, const std::string& host); - // Allow mixed content to be visible (non filtered). - void AllowMixedContentForHost(const std::string& host); - - // Returns whether the specified host is allowed to show mixed content. - bool DidAllowMixedContentForHost(const std::string& host) const; - - // Reloads the tab. - void Reload(); - // Shows the pending messages (in info-bars) if any. void ShowPendingMessages(); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 0a39bce..92cbd29 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1925,8 +1925,6 @@ 'browser/ssl/ssl_host_state.h', 'browser/ssl/ssl_manager.cc', 'browser/ssl/ssl_manager.h', - 'browser/ssl/ssl_mixed_content_handler.cc', - 'browser/ssl/ssl_mixed_content_handler.h', 'browser/ssl/ssl_policy.cc', 'browser/ssl/ssl_policy.h', 'browser/ssl/ssl_policy_backend.cc', |