chrome/browser/ui/search/instant_ntp_prerenderer.cc - Issue 23455047: InstantExtended: Send search URLs to renderers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/search/instant_ntp_prerenderer.cc

Issue 23455047: InstantExtended: Send search URLs to renderers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More browsertest fixes Created 7 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:

Index: chrome/browser/ui/search/instant_ntp_prerenderer.cc

diff --git a/chrome/browser/ui/search/instant_ntp_prerenderer.cc b/chrome/browser/ui/search/instant_ntp_prerenderer.cc

index d25c0c09ee1035a76998491b5ad690ff83cee6e6..a71d123cf0a4039d53e9b048c33853e53c918c66 100644

--- a/chrome/browser/ui/search/instant_ntp_prerenderer.cc

+++ b/chrome/browser/ui/search/instant_ntp_prerenderer.cc

@@ -23,6 +23,7 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/content_settings.h"

#include "chrome/common/pref_names.h"

+#include "chrome/common/search_urls.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/web_contents.h"

@@ -261,7 +262,7 @@ void InstantNTPPrerenderer::ResetNTP(const std::string& instant_url) {

bool InstantNTPPrerenderer::PageIsCurrent() const {

const std::string& instant_url = GetInstantURL();

if (instant_url.empty() ||

- !chrome::MatchesOriginAndPath(GURL(ntp()->instant_url()),

+ !search::MatchesOriginAndPath(GURL(ntp()->instant_url()),

GURL(instant_url)))

return false;