content/public/common/url_constants.h - 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: content/public/common/url_constants.h

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: content/public/common/url_constants.h

diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h

index 194bb3afb9404244e9a6663245045514f7048665..f2f70786295ac42221cc89130fb73a2b31ae9d3c 100644

--- a/content/public/common/url_constants.h

+++ b/content/public/common/url_constants.h

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

#define CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_

#include "content/common/content_export.h"

+#include "url/url_constants.h"

// Contains constants for known URLs and portions thereof.

@@ -23,8 +24,6 @@ CONTENT_EXPORT extern const char kFileScheme[];

CONTENT_EXPORT extern const char kFileSystemScheme[];

CONTENT_EXPORT extern const char kFtpScheme[];

CONTENT_EXPORT extern const char kGuestScheme[];

-CONTENT_EXPORT extern const char kHttpScheme[];

-CONTENT_EXPORT extern const char kHttpsScheme[];

CONTENT_EXPORT extern const char kJavaScriptScheme[];

CONTENT_EXPORT extern const char kMailToScheme[];

CONTENT_EXPORT extern const char kMetadataScheme[];

« no previous file with comments | « content/plugin/webplugin_proxy.cc ('k') | content/public/common/url_constants.cc » ('j') | no next file with comments »