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

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 1977463002: Prerender: Remove MatchComplete status. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format Created 4 years, 7 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
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_histograms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 4d965b8c85501b2ff7dfa300c053eaaad2873e9b..bcf12fe4a23d659b5271c302ba3f29b15f598611 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -205,7 +205,6 @@ PrerenderContents::PrerenderContents(
has_stopped_loading_(false),
has_finished_loading_(false),
final_status_(FINAL_STATUS_MAX),
- match_complete_status_(MATCH_COMPLETE_DEFAULT),
prerendering_has_been_cancelled_(false),
child_id_(-1),
route_id_(-1),
@@ -347,8 +346,7 @@ PrerenderContents::~PrerenderContents() {
prerendering_has_been_cancelled() || final_status() == FINAL_STATUS_USED);
DCHECK_NE(ORIGIN_MAX, origin());
- prerender_manager_->RecordFinalStatusWithMatchCompleteStatus(
- origin(), match_complete_status(), final_status());
+ prerender_manager_->RecordFinalStatus(origin(), final_status());
bool used = final_status() == FINAL_STATUS_USED ||
final_status() == FINAL_STATUS_WOULD_HAVE_BEEN_USED;
@@ -462,12 +460,10 @@ bool PrerenderContents::OnMessageReceived(const IPC::Message& message) {
bool PrerenderContents::CheckURL(const GURL& url) {
if (!url.SchemeIsHTTPOrHTTPS()) {
- DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
return false;
}
- if (match_complete_status_ != MATCH_COMPLETE_REPLACEMENT_PENDING &&
- prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
+ if (prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
Destroy(FINAL_STATUS_RECENTLY_VISITED);
return false;
}
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_histograms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698