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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/web_contents/interstitial_page_impl.cc

Issue 23022006: Remove GetActiveEntry usage from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
« content/browser/ssl/ssl_manager.cc ('K') | « content/browser/ssl/ssl_manager.cc ('k') | content/browser/web_contents/navigation_controller_impl.cc » ('j') | content/browser/web_contents/navigation_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/interstitial_page_impl.cc
diff --git a/content/browser/web_contents/interstitial_page_impl.cc b/content/browser/web_contents/interstitial_page_impl.cc
index 232217d368f66cb6a88557a42c227a3d737fee8e..f86c62106a18de3d1169ecd4766d80a31e67f4ff 100644
--- a/content/browser/web_contents/interstitial_page_impl.cc
+++ b/content/browser/web_contents/interstitial_page_impl.cc
@@ -272,7 +272,7 @@ void InterstitialPageImpl::Hide() {
render_view_host_ = NULL;
web_contents_->DetachInterstitialPage();
// Let's revert to the original title if necessary.
- NavigationEntry* entry = web_contents_->GetController().GetActiveEntry();
+ NavigationEntry* entry = web_contents_->GetController().GetVisibleEntry();
if (!new_navigation_ && should_revert_web_contents_title_) {
entry->SetTitle(original_web_contents_title_);
web_contents_->NotifyNavigationStateChanged(INVALIDATE_TYPE_TITLE);
@@ -412,7 +412,7 @@ void InterstitialPageImpl::UpdateTitle(
return;
DCHECK(render_view_host == render_view_host_);
- NavigationEntry* entry = web_contents_->GetController().GetActiveEntry();
+ NavigationEntry* entry = web_contents_->GetController().GetVisibleEntry();
if (!entry) {
// Crash reports from the field indicate this can be NULL.
// This is unexpected as InterstitialPages constructed with the
« content/browser/ssl/ssl_manager.cc ('K') | « content/browser/ssl/ssl_manager.cc ('k') | content/browser/web_contents/navigation_controller_impl.cc » ('j') | content/browser/web_contents/navigation_controller_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698