Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1497426 - Add source.label support for native Toast Notification. r=aklotz

Browse Source 
XUL version of notification and macOS's notification center show source label
("via <URL>" to show origin URL).  Windows's toast notification should show
it like XUL version.

Windows 10 anniversary update or later has placement=attribution attribute for
this usages. https://blogs.msdn.microsoft.com/tiles_and_toasts/2016/05/23/notificationsextensions-updated-for-anniversary-update-of-windows-10/#toastattribution
is more detail about attribution text, so we should use it.

As example, screenshots of this change are attached in this bug.

Differential Revision: https://phabricator.services.mozilla.com/D8196

--HG--
extra : rebase_source : 96615fa2c1bf4d201879b630c4eeb3bb7f9a44ac
This commit is contained in:
Makoto Kato 2018-10-09 16:26:42 +09:00
parent 5a2271d90b
commit fe4e262656
1 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
widget/windows/ToastNotificationHandler.cpp
View File

@ -8,6 +8,7 @@
#include "imgIRequest.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/WindowsVersion.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIStringBundle.h"
#include "nsIURI.h"
@ -181,12 +182,18 @@ ToastNotificationHandler::ShowAlert()
return true;
}
ComPtr<IXmlDocument> toastXml =
InitializeXmlForTemplate(
!mHasImage ?
ToastTemplateType::ToastTemplateType_ToastText03 :
ToastTemplateType::ToastTemplateType_ToastImageAndText03);
ToastTemplateType toastTemplate;
if (mHostPort.IsEmpty()) {
toastTemplate = mHasImage ?
ToastTemplateType::ToastTemplateType_ToastImageAndText03 :
ToastTemplateType::ToastTemplateType_ToastText03;
} else {
toastTemplate = !mHasImage ?
ToastTemplateType::ToastTemplateType_ToastImageAndText04 :
ToastTemplateType::ToastTemplateType_ToastText04;
}
ComPtr<IXmlDocument> toastXml = InitializeXmlForTemplate(toastTemplate);
if (!toastXml) {
return false;
}
@ -283,8 +290,36 @@ ToastNotificationHandler::ShowAlert()
}
if (!mHostPort.IsEmpty()) {
nsAutoString disableButtonTitle;
const char16_t* formatStrings[] = { mHostPort.get() };
ComPtr<IXmlNode> urlTextNodeRoot;
hr = toastTextElements->Item(2, &urlTextNodeRoot);
if (NS_WARN_IF(FAILED(hr))) {
return false;
}
nsAutoString urlReference;
bundle->FormatStringFromName("source.label",
formatStrings,
ArrayLength(formatStrings),
urlReference);
if (NS_WARN_IF(!SetNodeValueString(urlReference, urlTextNodeRoot.Get(),
toastXml.Get()))) {
return false;
}
if (IsWin10AnniversaryUpdateOrLater()) {
ComPtr<IXmlElement> placementText;
hr = urlTextNodeRoot.As(&placementText);
if (SUCCEEDED(hr)) {
// placement is supported on Windows 10 Anniversary Update or later
SetAttribute(placementText.Get(), HStringReference(L"placement").Get(),
NS_LITERAL_STRING("attribution"));
}
}
nsAutoString disableButtonTitle;
bundle->FormatStringFromName("webActions.disableForOrigin.label",
formatStrings,
ArrayLength(formatStrings),