chrome/browser/autocomplete/zero_suggest_provider.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/autocomplete/zero_suggest_provider.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/autocomplete/zero_suggest_provider.cc

diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc

index 0a888820f24ec752cb23d84445fa52abf902d38e..51e24f66541a7097090cbba52bc1601e1faf29b9 100644

--- a/chrome/browser/autocomplete/zero_suggest_provider.cc

+++ b/chrome/browser/autocomplete/zero_suggest_provider.cc

@@ -385,8 +385,8 @@ bool ZeroSuggestProvider::CanShowZeroSuggestWithoutSendingURL(

// with other schemes (e.g. chrome://). That may require improvements to

// the formatting of the verbatim result returned by MatchForCurrentURL().

if (!current_page_url.is_valid() ||

- ((current_page_url.scheme() != content::kHttpScheme) &&

- (current_page_url.scheme() != content::kHttpsScheme)))

+ ((current_page_url.scheme() != url::kHttpScheme) &&

+ (current_page_url.scheme() != url::kHttpsScheme)))

return false;

return true;