| Index: content/browser/ssl/ssl_manager.cc
|
| diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
|
| index e4c71e3dc4e0f8b2c520afe4cb9d9979d51140d9..ab1048c31404dc35e1eb261f1aab427c8d76f10e 100644
|
| --- a/content/browser/ssl/ssl_manager.cc
|
| +++ b/content/browser/ssl/ssl_manager.cc
|
| @@ -121,10 +121,7 @@
|
| }
|
| }
|
|
|
| - policy()->UpdateEntry(entry, controller_->delegate()->GetWebContents());
|
| - // Always notify the WebContents that the SSL state changed when a
|
| - // load is committed, in case the active navigation entry has changed.
|
| - NotifyDidChangeVisibleSSLState();
|
| + UpdateEntry(entry);
|
| }
|
|
|
| void SSLManager::DidDisplayInsecureContent() {
|
| @@ -187,16 +184,12 @@
|
|
|
| SSLStatus original_ssl_status = entry->GetSSL(); // Copy!
|
|
|
| - policy()->UpdateEntry(entry, controller_->delegate()->GetWebContents());
|
| + WebContentsImpl* contents =
|
| + static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
|
| + policy()->UpdateEntry(entry, contents);
|
|
|
| if (!entry->GetSSL().Equals(original_ssl_status))
|
| - NotifyDidChangeVisibleSSLState();
|
| -}
|
| -
|
| -void SSLManager::NotifyDidChangeVisibleSSLState() {
|
| - WebContentsImpl* contents =
|
| - static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
|
| - contents->DidChangeVisibleSSLState();
|
| + contents->DidChangeVisibleSSLState();
|
| }
|
|
|
| } // namespace content
|
|
|