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

Unified Diff: chrome/renderer/prerender/prerender_helper.cc

Issue 8404018: chrome.loadTimes() shouldn't be affected by in-document navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge Created 9 years, 1 month 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: chrome/renderer/prerender/prerender_helper.cc
diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc
index 58eb2f4db8b4941e934c6246f4f533add3200b54..c016145a2d32bf1757df631b2708ea002cc8cc5c 100644
--- a/chrome/renderer/prerender/prerender_helper.cc
+++ b/chrome/renderer/prerender/prerender_helper.cc
@@ -7,12 +7,12 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "chrome/common/render_messages.h"
-#include "content/public/renderer/navigation_state.h"
+#include "content/public/renderer/document_state.h"
#include "content/public/renderer/render_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-using content::NavigationState;
+using content::DocumentState;
// Helper macro for histograms.
#define RECORD_PLT(tag, perceived_page_load_time) { \
@@ -130,9 +130,9 @@ void PrerenderHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) {
NOTREACHED();
return;
}
- NavigationState* navigation_state =
- NavigationState::FromDataSource(data_source);
- prerender_start_time_ = navigation_state->request_time();
+ DocumentState* document_state =
+ DocumentState::FromDataSource(data_source);
+ prerender_start_time_ = document_state->request_time();
// The first navigation for prerendering RenderViews can only be triggered
// from PrerenderContents, so there should be a request_time.
DCHECK(!prerender_start_time_.is_null());
« no previous file with comments | « chrome/renderer/page_load_histograms.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698