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

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

Issue 6880139: Changing URL match method to support fragments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: New browser tests Created 9 years, 8 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: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index f4fa03342b0b02ea5196ba5050a302317abe364d..0a2651276e1428c1a037de591b3848e6235cf2e9 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/prerender/prerender_contents.h"
+#include <algorithm>
+
#include "base/i18n/rtl.h"
#include "base/process_util.h"
#include "base/task.h"
@@ -37,6 +39,23 @@
namespace prerender {
+// Compares URLs ignoring any ref for the purposes of matching URLs when
+// prerendering.
+struct PrerenderUrlPredicate {
+ explicit PrerenderUrlPredicate(const GURL& url)
+ : url_(url) {
+ }
+
+ bool operator()(const GURL& url) const {
+ return url.scheme() == url_.scheme() &&
+ url.host() == url_.host() &&
+ url.port() == url_.port() &&
+ url.path() == url_.path() &&
+ url.query() == url_.query();
+ }
+ GURL url_;
+};
+
void AddChildRoutePair(ResourceDispatcherHost* rdh,
int child_id, int route_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -507,8 +526,9 @@ bool PrerenderContents::AddAliasURL(const GURL& url) {
}
bool PrerenderContents::MatchesURL(const GURL& url) const {
- return std::find(alias_urls_.begin(), alias_urls_.end(), url)
- != alias_urls_.end();
+ return std::find_if(alias_urls_.begin(),
+ alias_urls_.end(),
+ PrerenderUrlPredicate(url)) != alias_urls_.end();
}
void PrerenderContents::DidStopLoading() {

Powered by Google App Engine
This is Rietveld 408576698