Index: content/browser/ssl/ssl_manager.cc |
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc |
index c86dccdcda6b73078349aa079742d69debc3e471..f0fab046a52cc36b964146cd9e7fdceb275dc394 100644 |
--- a/content/browser/ssl/ssl_manager.cc |
+++ b/content/browser/ssl/ssl_manager.cc |
@@ -89,7 +89,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())); |
Charlie Reis
2013/08/16 22:10:14
I like that we're switching to GetLastCommittedEnt
|
} |
} |
@@ -131,7 +131,8 @@ void SSLManager::DidCommitProvisionalLoad( |
Details<LoadCommittedDetails>(in_details).ptr(); |
NavigationEntryImpl* entry = |
- NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()); |
+ NavigationEntryImpl::FromNavigationEntry( |
+ controller_->GetLastCommittedEntry()); |
if (details->is_main_frame) { |
if (entry) { |
@@ -161,12 +162,14 @@ void SSLManager::DidCommitProvisionalLoad( |
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); |
} |