diff options
| author | pstanek@opera.com <pstanek@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 09:30:35 +0000 |
|---|---|---|
| committer | pstanek@opera.com <pstanek@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 09:30:35 +0000 |
| commit | 63e38083c0d0223a4da7619800adeea918e2cf2c (patch) | |
| tree | 5aa260c78514cb56a3deb3b014e5522bb5b63f86 /content | |
| parent | 92f5e460585386068547e676935671cd09fb8d9d (diff) | |
| download | chromium_src-63e38083c0d0223a4da7619800adeea918e2cf2c.zip chromium_src-63e38083c0d0223a4da7619800adeea918e2cf2c.tar.gz chromium_src-63e38083c0d0223a4da7619800adeea918e2cf2c.tar.bz2 | |
Notify about reset of the "displayed insecure content" state flag
and take it into when updating the navigation entry.
BUG=253820
Review URL: https://chromiumcodereview.appspot.com/20986004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/ssl/ssl_policy.cc | 2 | ||||
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index ec55736..41156d5 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -138,6 +138,8 @@ void SSLPolicy::UpdateEntry(NavigationEntryImpl* entry, if (web_contents->DisplayedInsecureContent()) entry->GetSSL().content_status |= SSLStatus::DISPLAYED_INSECURE_CONTENT; + else + entry->GetSSL().content_status &= ~SSLStatus::DISPLAYED_INSECURE_CONTENT; } void SSLPolicy::OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 3633e3f..72c6bd0 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2689,6 +2689,8 @@ void WebContentsImpl::DidNavigateMainFramePostCommit( // Once the main frame is navigated, we're no longer considered to have // displayed insecure content. displayed_insecure_content_ = false; + SSLManager::NotifySSLInternalStateChanged( + GetController().GetBrowserContext()); } // Notify observers about navigation. |