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: Update url/BUILD.gn and address some style nits. Created 6 years, 8 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 9fa5607ccf48aa92275add992e47aebe79fdfabe..319cec458d79fbd670432ca77b1df454384f8b9d 100644

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

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

@@ -8,6 +8,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/common/url_constants.h"

#include "url/gurl.h"

+#include "url/url_constants.h"

namespace content_settings_helper {

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

std::string port_component(origin.IntPort() != url_parse::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());