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

Unified Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 1312213010: PageLoadMetrics renderer and browser implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Relax DCHECK constraints slightly for tests Created 5 years, 3 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/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index f24999058b5f36021c507f91087d45f01b5435a8..2c5e773cace4de12b361e5a6032121f782f21834 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -25,6 +25,7 @@ NavigationHandleImpl::NavigationHandleImpl(const GURL& url,
net_error_code_(net::OK),
state_(DID_START),
is_main_frame_(is_main_frame),
+ is_same_page_(false),
is_transferring_(false),
delegate_(delegate) {
delegate_->DidStartNavigation(this);
@@ -46,6 +47,13 @@ bool NavigationHandleImpl::IsInMainFrame() const {
return is_main_frame_;
}
+bool NavigationHandleImpl::IsSamePage() {
+ DCHECK(state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE)
+ << "This accessor should not be called before the navigation has "
+ "committed.";
+ return is_same_page_;
+}
+
bool NavigationHandleImpl::HasCommittedDocument() const {
return state_ == DID_COMMIT;
}
@@ -59,7 +67,8 @@ void NavigationHandleImpl::DidRedirectNavigation(const GURL& new_url) {
delegate_->DidRedirectNavigation(this);
}
-void NavigationHandleImpl::DidCommitNavigation() {
+void NavigationHandleImpl::DidCommitNavigation(bool same_page) {
+ is_same_page_ = same_page;
state_ = net_error_code_ == net::OK ? DID_COMMIT : DID_COMMIT_ERROR_PAGE;
delegate_->DidCommitNavigation(this);
}

Powered by Google App Engine
This is Rietveld 408576698