chrome/browser/history/history_backend.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/history/history_backend.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/history/history_backend.cc

diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc

index fca0c7a69267ac06126bec1a3737e6e4be80a56b..935c2a468e4cc0ca94fbbd533bbe9c90cab5f290 100644

--- a/chrome/browser/history/history_backend.cc

+++ b/chrome/browser/history/history_backend.cc

@@ -405,8 +405,8 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) {

!is_keyword_generated) {

const GURL& origin_url(has_redirects ?

request.redirects[0] : request.url);

- if (origin_url.SchemeIs(content::kHttpScheme) ||

- origin_url.SchemeIs(content::kHttpsScheme) ||

+ if (origin_url.SchemeIs(url::kHttpScheme) ||

+ origin_url.SchemeIs(url::kHttpsScheme) ||

origin_url.SchemeIs(content::kFtpScheme)) {

std::string host(origin_url.host());

size_t registry_length =