corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1277106 - Part 2: Expand MOZ_UTF16() strings to u"" string literals. r=Waldo

Browse Source
This commit is contained in:
Chris Peterson
2016-07-20 22:03:25 -07:00
parent 0eccc785ff
commit 6c0f810682
160 changed files with 720 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docshell/base/nsDocShell.cpp
View File

@@ -5073,7 +5073,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
// LoadErrorPage. If the page doesn't have a title, we will use a blank
// space which will be trimmed and thus treated as empty by the front-end.
if (messageStr.IsEmpty()) {
messageStr.AssignLiteral(MOZ_UTF16(" "));
messageStr.AssignLiteral(u" ");
}
} else {
// Errors requiring simple formatting
@@ -7688,7 +7688,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
// We have to load a fallback in this case.
// XXX: We always load about blank here, firefox has to overwrite this if
// it wants to display something else.
return LoadURI(MOZ_UTF16("about:blank"), // URI string
return LoadURI(u"about:blank", // URI string
nsIChannel::LOAD_NORMAL, // Load flags
nullptr, // Referring URI
nullptr, // Post data stream
@@ -13011,19 +13011,19 @@ nsDocShell::ConfirmRepost(bool* aRepost)
"Unable to set up repost prompter.");
nsXPIDLString brandName;
rv = brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"),
rv = brandBundle->GetStringFromName(u"brandShortName",
getter_Copies(brandName));
nsXPIDLString msgString, button0Title;
if (NS_FAILED(rv)) { // No brand, use the generic version.
rv = appBundle->GetStringFromName(MOZ_UTF16("confirmRepostPrompt"),
rv = appBundle->GetStringFromName(u"confirmRepostPrompt",
getter_Copies(msgString));
} else {
// Brand available - if the app has an override file with formatting, the
// app name will be included. Without an override, the prompt will look
// like the generic version.
const char16_t* formatStrings[] = { brandName.get() };
rv = appBundle->FormatStringFromName(MOZ_UTF16("confirmRepostPrompt"),
rv = appBundle->FormatStringFromName(u"confirmRepostPrompt",
formatStrings,
ArrayLength(formatStrings),
getter_Copies(msgString));
@@ -13032,7 +13032,7 @@ nsDocShell::ConfirmRepost(bool* aRepost)
return rv;
}
rv = appBundle->GetStringFromName(MOZ_UTF16("resendButton.label"),
rv = appBundle->GetStringFromName(u"resendButton.label",
getter_Copies(button0Title));
if (NS_FAILED(rv)) {
return rv;