chrome/browser/ui/search_engines/search_engine_tab_helper.cc - Issue 254763005: Move some content url constants to /url.

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_engines/search_engine_tab_helper.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 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:

Index: chrome/browser/ui/search_engines/search_engine_tab_helper.cc

diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc

index 7ebda485ad15dabd61e25fce9c850aa16a4cd25a..db0a28f64767af77d2cad8cd19235b4d7efc8725 100644

--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc

+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc

@@ -55,7 +55,7 @@ base::string16 GenerateKeywordFromNavigationEntry(

// If we relax the path constraint, we need to be sure to sanitize the path

// elements and update AutocompletePopup to look for keywords using the path.

// See http://b/issue?id=863583.

- if (!url.SchemeIs(content::kHttpScheme) || (url.path().length() > 1))

+ if (!url.SchemeIs(url::kHttpScheme) || (url.path().length() > 1))

return base::string16();

return TemplateURLService::GenerateKeyword(url);