chrome/browser/extensions/api/content_settings/content_settings_helpers.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/extensions/api/content_settings/content_settings_helpers.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/local_shared_objects_container.cc ('k') | chrome/browser/extensions/api/cookies/cookies_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

index 29af76ed5d8552f7c66b77cd99c38fdf0e260272..6601abdb2debdd836562cd853adaa5115786ef58 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc

@@ -43,9 +43,9 @@ COMPILE_ASSERT(arraysize(kContentSettingNames) <=

// TODO(bauerb): Move this someplace where it can be reused.

std::string GetDefaultPort(const std::string& scheme) {

- if (scheme == content::kHttpScheme)

+ if (scheme == url::kHttpScheme)

return "80";

- if (scheme == content::kHttpsScheme)

+ if (scheme == url::kHttpsScheme)

return "443";

NOTREACHED();

return std::string();