chrome/common/content_settings_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/common/content_settings_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/common/content_settings_helper.cc

diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc

index dda2cd5ad0c7360413d120a47d991d5c442dd86c..e553eabd9d4fa5a3d96e903869bac99f84a443af 100644

--- a/chrome/common/content_settings_helper.cc

+++ b/chrome/common/content_settings_helper.cc

@@ -15,7 +15,7 @@ std::string OriginToString(const GURL& origin) {

std::string port_component(origin.IntPort() != url::PORT_UNSPECIFIED

? ":" + origin.port()

: std::string());

- std::string scheme_component(!origin.SchemeIs(content::kHttpScheme)

+ std::string scheme_component(!origin.SchemeIs(url::kHttpScheme)

? origin.scheme() +

content::kStandardSchemeSeparator

: std::string());