chrome/browser/ui/search/instant_controller.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_controller.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_controller.cc

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

index 2c43c2229a08aa342f253b2b22a77721f1ce56e1..024f27697aba349405d0dbe13a24185f7b7c1984 100644

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

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

@@ -24,6 +24,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings_types.h"

#include "chrome/common/pref_names.h"

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

#include "chrome/common/url_constants.h"

#include "components/sessions/serialized_navigation_entry.h"

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

@@ -156,7 +157,7 @@ void InstantController::InstantPageLoadFailed(content::WebContents* contents) {

GURL instant_url = chrome::GetInstantURL(profile(),

chrome::kDisableStartMargin);

if (instant_tab_->IsLocal() ||

- !chrome::MatchesOriginAndPath(instant_url, current_url) ||

+ !search::MatchesOriginAndPath(instant_url, current_url) ||

!current_url.ref().empty() ||

contents->GetController().CanGoForward())

return;