Add UTF-16 versions of constants to url_constants.h
This will enable us to stop calling base::ASCIIToUTF16() and base::UTF8ToUTF16() on the ASCII constants. Change-Id: If2358734b1f76b5809f4247eb63e8fcf6aff1e64 Bug: 1281914 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3350885 Reviewed-by: Timothy Gu <timothygu@chromium.org> Commit-Queue: Dan McArdle <dmcardle@chromium.org> Cr-Commit-Position: refs/heads/main@{#953312}
This commit is contained in:
Dan McArdle
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
2ca6189891
commit
672f4e3311
@ -7,33 +7,56 @@
|
||||
namespace url {
|
||||
|
||||
const char kAboutBlankURL[] = "about:blank";
|
||||
const char16_t kAboutBlankURL16[] = u"about:blank";
|
||||
const char kAboutSrcdocURL[] = "about:srcdoc";
|
||||
const char16_t kAboutSrcdocURL16[] = u"about:srcdoc";
|
||||
|
||||
const char kAboutBlankPath[] = "blank";
|
||||
const char16_t kAboutBlankPath16[] = u"blank";
|
||||
const char kAboutSrcdocPath[] = "srcdoc";
|
||||
const char16_t kAboutSrcdocPath16[] = u"srcdoc";
|
||||
|
||||
const char kAboutScheme[] = "about";
|
||||
const char16_t kAboutScheme16[] = u"about";
|
||||
const char kBlobScheme[] = "blob";
|
||||
const char16_t kBlobScheme16[] = u"blob";
|
||||
const char kContentScheme[] = "content";
|
||||
const char16_t kContentScheme16[] = u"content";
|
||||
const char kContentIDScheme[] = "cid";
|
||||
const char16_t kContentIDScheme16[] = u"cid";
|
||||
const char kDataScheme[] = "data";
|
||||
const char16_t kDataScheme16[] = u"data";
|
||||
const char kFileScheme[] = "file";
|
||||
const char16_t kFileScheme16[] = u"file";
|
||||
const char kFileSystemScheme[] = "filesystem";
|
||||
const char16_t kFileSystemScheme16[] = u"filesystem";
|
||||
const char kFtpScheme[] = "ftp";
|
||||
const char16_t kFtpScheme16[] = u"ftp";
|
||||
const char kHttpScheme[] = "http";
|
||||
const char16_t kHttpScheme16[] = u"http";
|
||||
const char kHttpsScheme[] = "https";
|
||||
const char16_t kHttpsScheme16[] = u"https";
|
||||
const char kJavaScriptScheme[] = "javascript";
|
||||
const char16_t kJavaScriptScheme16[] = u"javascript";
|
||||
const char kMailToScheme[] = "mailto";
|
||||
const char16_t kMailToScheme16[] = u"mailto";
|
||||
// This is for QuicTransport (https://wicg.github.io/web-transport/).
|
||||
// See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
|
||||
const char kQuicTransportScheme[] = "quic-transport";
|
||||
const char16_t kQuicTransportScheme16[] = u"quic-transport";
|
||||
const char kTelScheme[] = "tel";
|
||||
const char16_t kTelScheme16[] = u"tel";
|
||||
const char kUrnScheme[] = "urn";
|
||||
const char16_t kUrnScheme16[] = u"urn";
|
||||
const char kUuidInPackageScheme[] = "uuid-in-package";
|
||||
const char16_t kUuidInPackageScheme16[] = u"uuid-in-package";
|
||||
const char kWsScheme[] = "ws";
|
||||
const char16_t kWsScheme16[] = u"ws";
|
||||
const char kWssScheme[] = "wss";
|
||||
const char16_t kWssScheme16[] = u"wss";
|
||||
|
||||
const char kStandardSchemeSeparator[] = "://";
|
||||
const char16_t kStandardSchemeSeparator16[] = u"://";
|
||||
|
||||
const size_t kMaxURLChars = 2 * 1024 * 1024;
|
||||
|
||||
|
||||
@ -12,33 +12,56 @@
|
||||
namespace url {
|
||||
|
||||
COMPONENT_EXPORT(URL) extern const char kAboutBlankURL[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kAboutBlankURL16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kAboutSrcdocURL[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kAboutSrcdocURL16[];
|
||||
|
||||
COMPONENT_EXPORT(URL) extern const char kAboutBlankPath[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kAboutBlankPath16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kAboutSrcdocPath[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kAboutSrcdocPath16[];
|
||||
|
||||
COMPONENT_EXPORT(URL) extern const char kAboutScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kAboutScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kBlobScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kBlobScheme16[];
|
||||
// The content scheme is specific to Android for identifying a stored file.
|
||||
COMPONENT_EXPORT(URL) extern const char kContentScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kContentScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kContentIDScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kContentIDScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kDataScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kDataScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kFileScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kFileScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kFileSystemScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kFileSystemScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kFtpScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kFtpScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kHttpScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kHttpScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kHttpsScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kHttpsScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kJavaScriptScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kMailToScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kQuicTransportScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kTelScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kUrnScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kUuidInPackageScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kWsScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kWsScheme16[];
|
||||
COMPONENT_EXPORT(URL) extern const char kWssScheme[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kWssScheme16[];
|
||||
|
||||
// Used to separate a standard scheme and the hostname: "://".
|
||||
COMPONENT_EXPORT(URL) extern const char kStandardSchemeSeparator[];
|
||||
COMPONENT_EXPORT(URL) extern const char16_t kStandardSchemeSeparator16[];
|
||||
|
||||
COMPONENT_EXPORT(URL) extern const size_t kMaxURLChars;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user