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

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

Issue 25654005: Remove GetActiveEntry usage from content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/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 2198b149f2d69862afd5fd05eed04bb5955a2d73..d7dc62911b9bb3b51a1966b128e83c3f719b57c3 100644
--- a/content/browser/web_contents/interstitial_page_impl.cc
+++ b/content/browser/web_contents/interstitial_page_impl.cc
@@ -275,7 +275,7 @@ void InterstitialPageImpl::Hide() {
frame_tree_.SwapMainFrame(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);
@@ -415,7 +415,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

Powered by Google App Engine
This is Rietveld 408576698