Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on widget. r=nfroyd

Browse Source
This commit is contained in:
Makoto Kato 2015-10-28 14:28:06 +09:00
parent b53bda208d
commit 99903f5ab5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/cocoa/OSXNotificationCenter.mm
View File

@ -252,7 +252,7 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
if (!hostPort.IsEmpty()) {
const char16_t* formatStrings[] = { hostPort.get() };
nsXPIDLString notificationSource;
bundle->FormatStringFromName(NS_LITERAL_STRING("source.label").get(),
bundle->FormatStringFromName(MOZ_UTF16("source.label"),
formatStrings,
ArrayLength(formatStrings),
getter_Copies(notificationSource));
@ -267,18 +267,18 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
if (nsAlertsUtils::IsActionablePrincipal(aPrincipal)) {
if (NS_SUCCEEDED(rv)) {
nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle;
bundle->GetStringFromName(NS_LITERAL_STRING("closeButton.title").get(),
bundle->GetStringFromName(MOZ_UTF16("closeButton.title"),
getter_Copies(closeButtonTitle));
bundle->GetStringFromName(NS_LITERAL_STRING("actionButton.label").get(),
bundle->GetStringFromName(MOZ_UTF16("actionButton.label"),
getter_Copies(actionButtonTitle));
if (!hostPort.IsEmpty()) {
const char16_t* formatStrings[] = { hostPort.get() };
bundle->FormatStringFromName(NS_LITERAL_STRING("webActions.disableForOrigin.label").get(),
bundle->FormatStringFromName(MOZ_UTF16("webActions.disableForOrigin.label"),
formatStrings,
ArrayLength(formatStrings),
getter_Copies(disableButtonTitle));
}
bundle->GetStringFromName(NS_LITERAL_STRING("webActions.settings.label").get(),
bundle->GetStringFromName(MOZ_UTF16("webActions.settings.label"),
getter_Copies(settingsButtonTitle));
notification.hasActionButton = YES;

2
widget/cocoa/nsFilePicker.mm
View File

@ -121,7 +121,7 @@ NSView* nsFilePicker::GetAccessoryView()
nsresult rv = sbs->CreateBundle("chrome://global/locale/filepicker.properties", getter_AddRefs(bundle));
if (NS_SUCCEEDED(rv)) {
nsXPIDLString locaLabel;
bundle->GetStringFromName(NS_LITERAL_STRING("formatLabel").get(),
bundle->GetStringFromName(MOZ_UTF16("formatLabel"),
getter_Copies(locaLabel));
if (locaLabel) {
label = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(locaLabel.get())