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

Unified Diff: content/browser/web_contents/navigation_controller_impl.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/web_contents/navigation_controller_impl.cc
diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc
index faad72b5f38b113d66dea7be9dc99f64200e3186..678b7b491d23905779ea5c6aff3a42c4aef68cdd 100644
--- a/content/browser/web_contents/navigation_controller_impl.cc
+++ b/content/browser/web_contents/navigation_controller_impl.cc
@@ -268,14 +268,14 @@ void NavigationControllerImpl::ReloadInternal(bool check_for_repost,
if (transient_entry_index_ != -1) {
// If an interstitial is showing, treat a reload as a navigation to the
// transient entry's URL.
- NavigationEntryImpl* active_entry =
- NavigationEntryImpl::FromNavigationEntry(GetActiveEntry());
- if (!active_entry)
+ NavigationEntryImpl* transient_entry =
+ NavigationEntryImpl::FromNavigationEntry(GetTransientEntry());
+ if (!transient_entry)
return;
- LoadURL(active_entry->GetURL(),
+ LoadURL(transient_entry->GetURL(),
Referrer(),
PAGE_TRANSITION_RELOAD,
- active_entry->extra_headers());
+ transient_entry->extra_headers());
return;
}
@@ -462,8 +462,8 @@ bool NavigationControllerImpl::CanViewSource() const {
const std::string& mime_type = web_contents_->GetContentsMimeType();
bool is_viewable_mime_type = net::IsSupportedNonImageMimeType(mime_type) &&
!net::IsSupportedMediaMimeType(mime_type);
- NavigationEntry* active_entry = GetActiveEntry();
- return active_entry && !active_entry->IsViewSourceMode() &&
+ NavigationEntry* visible_entry = GetVisibleEntry();
+ return visible_entry && !visible_entry->IsViewSourceMode() &&
is_viewable_mime_type && !web_contents_->GetInterstitialPage();
}
@@ -1318,13 +1318,13 @@ void NavigationControllerImpl::PruneAllButVisible() {
// We should still have a last committed entry.
DCHECK_NE(-1, last_committed_entry_index_);
- NavigationEntryImpl* entry =
- NavigationEntryImpl::FromNavigationEntry(GetActiveEntry());
// We pass 0 instead of GetEntryCount() for the history_length parameter of
// SetHistoryLengthAndPrune, because it will create history_length additional
// history entries.
// TODO(jochen): This API is confusing and we should clean it up.
// http://crbug.com/178491
+ NavigationEntryImpl* entry =
+ NavigationEntryImpl::FromNavigationEntry(GetVisibleEntry());
web_contents_->SetHistoryLengthAndPrune(
entry->site_instance(), 0, entry->GetPageID());
}
@@ -1561,7 +1561,7 @@ void NavigationControllerImpl::NavigateToPendingEntry(ReloadType reload_type) {
void NavigationControllerImpl::NotifyNavigationEntryCommitted(
LoadCommittedDetails* details) {
- details->entry = GetActiveEntry();
+ details->entry = GetLastCommittedEntry();
// We need to notify the ssl_manager_ before the web_contents_ so the
// location bar will have up-to-date information about the security style

Powered by Google App Engine
This is Rietveld 408576698