| Index: content/browser/ssl/ssl_manager.cc
|
| diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
|
| index 42ee02fbb1cc90c4f22b3b9d46edc403cef9f245..6a6572a8d4622f0d90f8db5df806e305ed3f6fa7 100644
|
| --- a/content/browser/ssl/ssl_manager.cc
|
| +++ b/content/browser/ssl/ssl_manager.cc
|
| @@ -87,7 +87,7 @@ void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) {
|
| for (std::set<SSLManager*>::iterator i = managers->get().begin();
|
| i != managers->get().end(); ++i) {
|
| (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry(
|
| - (*i)->controller()->GetActiveEntry()));
|
| + (*i)->controller()->GetLastCommittedEntry()));
|
| }
|
| }
|
|
|
| @@ -114,7 +114,8 @@ SSLManager::~SSLManager() {
|
|
|
| void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
|
| NavigationEntryImpl* entry =
|
| - NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
|
| + NavigationEntryImpl::FromNavigationEntry(
|
| + controller_->GetLastCommittedEntry());
|
|
|
| if (details.is_main_frame) {
|
| if (entry) {
|
| @@ -144,12 +145,14 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
|
|
|
| void SSLManager::DidDisplayInsecureContent() {
|
| UpdateEntry(
|
| - NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
|
| + NavigationEntryImpl::FromNavigationEntry(
|
| + controller_->GetLastCommittedEntry()));
|
| }
|
|
|
| void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
|
| NavigationEntryImpl* navigation_entry =
|
| - NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
|
| + NavigationEntryImpl::FromNavigationEntry(
|
| + controller_->GetLastCommittedEntry());
|
| policy()->DidRunInsecureContent(navigation_entry, security_origin);
|
| UpdateEntry(navigation_entry);
|
| }
|
|
|