Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1064)

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 25654005: Remove GetActiveEntry usage from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comment, added TODO, rebased on ToT. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/browser/web_contents/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698