Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 04:09:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1202933, Part 2 - Show the origin for OS X notifications. r=MattN,wchen

Browse Source 
--HG--
extra : commitid : JKh5o1SBcUX
extra : rebase_source : 07c7c73cd32f48e97a2eed1a7b75177cab3a1e32
This commit is contained in:
Kit Cambridge 2015-10-05 19:48:05 -07:00
parent 529b10c68f
commit e83e929fef
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
widget/cocoa/OSXNotificationCenter.mm
View File

@ -17,6 +17,7 @@
#include "nsCOMPtr.h"
#include "nsIObserver.h"
#include "nsIContentPolicy.h"
#include "nsAlertsUtils.h"
#include "imgRequestProxy.h"
using namespace mozilla;
@ -240,16 +241,20 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
Class unClass = NSClassFromString(@"NSUserNotification");
id<FakeNSUserNotification> notification = [[unClass alloc] init];
notification.title = [NSString stringWithCharacters:(const unichar *)aAlertTitle.BeginReading()
length:aAlertTitle.Length()];
notification.informativeText = [NSString stringWithCharacters:(const unichar *)aAlertText.BeginReading()
length:aAlertText.Length()];
notification.title = nsCocoaUtils::ToNSString(aAlertTitle);
nsAutoString hostPort;
nsAlertsUtils::GetSourceHostPort(aPrincipal, hostPort);
if (!hostPort.IsEmpty()) {
notification.subtitle = nsCocoaUtils::ToNSString(hostPort);
}
notification.informativeText = nsCocoaUtils::ToNSString(aAlertText);
notification.soundName = NSUserNotificationDefaultSoundName;
notification.hasActionButton = NO;
// If this is not an application/extension alert, show additional actions dealing with permissions.
if (aPrincipal && !nsContentUtils::IsSystemOrExpandedPrincipal(aPrincipal)
&& !aPrincipal->GetIsNullPrincipal()) {
if (nsAlertsUtils::IsActionablePrincipal(aPrincipal)) {
nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
nsCOMPtr<nsIStringBundle> bundle;
nsresult rv = sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle));
@ -276,7 +281,7 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
forKey:@"_alternateActionButtonTitles"];
}
}
NSString *alertName = [NSString stringWithCharacters:(const unichar *)aAlertName.BeginReading() length:aAlertName.Length()];
NSString *alertName = nsCocoaUtils::ToNSString(aAlertName);
if (!alertName) {
return NS_ERROR_FAILURE;
}
@ -336,7 +341,7 @@ OSXNotificationCenter::CloseAlert(const nsAString& aAlertName,
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
NSString *alertName = [NSString stringWithCharacters:(const unichar *)aAlertName.BeginReading() length:aAlertName.Length()];
NSString *alertName = nsCocoaUtils::ToNSString(aAlertName);
CloseAlertCocoaString(alertName);
return NS_OK;