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

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

index e25a0927cef22af2093d5d6c1fde873d772a47ac..71a58c8ef011cde61ffe72c0933728eaca8523f0 100644

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

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

@@ -42,8 +42,8 @@ void InitializeSchemeWhitelist(std::set<std::string>* whitelist) {

whitelist->insert(std::string(content::kChromeUIScheme));

whitelist->insert(std::string(content::kFileScheme));

whitelist->insert(std::string(content::kFtpScheme));

- whitelist->insert(std::string(content::kHttpScheme));

- whitelist->insert(std::string(content::kHttpsScheme));

+ whitelist->insert(std::string(url::kHttpScheme));

+ whitelist->insert(std::string(url::kHttpsScheme));

whitelist->insert(std::string(content::kMailToScheme));

}

« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/url_database.cc » ('j') | no next file with comments »