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

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

Issue 12637002: Set IsInitialNavigation to false after commit, not document load. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 4cc10b89cb26d4a701797f9c001fe2739516d7be..d692b7d83142b283c8d044219ca6a9a4a04c4259 100644
--- a/content/browser/web_contents/navigation_controller_impl.cc
+++ b/content/browser/web_contents/navigation_controller_impl.cc
@@ -365,7 +365,7 @@ void NavigationControllerImpl::ContinuePendingReload() {
}
}
-bool NavigationControllerImpl::IsInitialNavigation() {
+bool NavigationControllerImpl::IsInitialNavigation() const {
return is_initial_navigation_;
}
@@ -825,13 +825,11 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
LoadEntry(entry);
}
-void NavigationControllerImpl::DocumentLoadedInFrame() {
- is_initial_navigation_ = false;
-}
-
bool NavigationControllerImpl::RendererDidNavigate(
const ViewHostMsg_FrameNavigate_Params& params,
LoadCommittedDetails* details) {
+ is_initial_navigation_ = false;
+
// Save the previous state before we clobber it.
if (GetLastCommittedEntry()) {
details->previous_url = GetLastCommittedEntry()->GetURL();

Powered by Google App Engine
This is Rietveld 408576698