Merge pull request #9903 from miniak/notification-subtitle

Notification subtitle on Mac

atom/browser/api/atom_api_notification.cc

@@ -57,6 +57,7 @@ Notification::Notification(v8::Isolate* isolate,
   mate::Dictionary opts;
   if (args->GetNext(&opts)) {
     opts.Get("title", &title_);
+    opts.Get("subtitle", &subtitle_);
     opts.Get("body", &body_);
     has_icon_ = opts.Get("icon", &icon_);
     if (has_icon_) {
@@ -84,31 +85,43 @@ mate::WrappableBase* Notification::New(mate::Arguments* args) {
 }
 
 // Getters
-base::string16 Notification::GetTitle() {
+base::string16 Notification::GetTitle() const {
   return title_;
 }
 
-base::string16 Notification::GetBody() {
+base::string16 Notification::GetSubtitle() const {
+  return subtitle_;
+}
+
+base::string16 Notification::GetBody() const {
   return body_;
 }
 
-bool Notification::GetSilent() {
+bool Notification::GetSilent() const {
   return silent_;
 }
 
-base::string16 Notification::GetReplyPlaceholder() {
+base::string16 Notification::GetReplyPlaceholder() const {
   return reply_placeholder_;
 }
 
-bool Notification::GetHasReply() {
+bool Notification::GetHasReply() const {
   return has_reply_;
 }
 
+std::vector<brightray::NotificationAction> Notification::GetActions() const {
+  return actions_;
+}
+
 // Setters
 void Notification::SetTitle(const base::string16& new_title) {
   title_ = new_title;
 }
 
+void Notification::SetSubtitle(const base::string16& new_subtitle) {
+  subtitle_ = new_subtitle;
+}
+
 void Notification::SetBody(const base::string16& new_body) {
   body_ = new_body;
 }
@@ -130,10 +143,6 @@ void Notification::SetActions(
   actions_ = actions;
 }
 
-std::vector<brightray::NotificationAction> Notification::GetActions() {
-  return actions_;
-}
-
 void Notification::NotificationAction(int index) {
   Emit("action", index);
 }
@@ -164,6 +173,7 @@ void Notification::Show() {
     if (notification_) {
       brightray::NotificationOptions options;
       options.title = title_;
+      options.subtitle = subtitle_;
       options.msg = body_;
       options.icon_url = GURL();
       options.icon = icon_.AsBitmap();
@@ -188,6 +198,8 @@ void Notification::BuildPrototype(v8::Isolate* isolate,
       .MakeDestroyable()
       .SetMethod("show", &Notification::Show)
       .SetProperty("title", &Notification::GetTitle, &Notification::SetTitle)
+      .SetProperty("subtitle", &Notification::GetSubtitle,
+                   &Notification::SetSubtitle)
       .SetProperty("body", &Notification::GetBody, &Notification::SetBody)
       .SetProperty("silent", &Notification::GetSilent, &Notification::SetSilent)
       .SetProperty("replyPlaceholder", &Notification::GetReplyPlaceholder,

atom/browser/api/atom_api_notification.h

@@ -47,15 +47,17 @@ class Notification : public mate::TrackableObject<Notification>,
   void Show();
 
   // Prop Getters
-  base::string16 GetTitle();
+  base::string16 GetTitle() const;
-  base::string16 GetBody();
+  base::string16 GetSubtitle() const;
-  bool GetSilent();
+  base::string16 GetBody() const;
-  base::string16 GetReplyPlaceholder();
+  bool GetSilent() const;
-  bool GetHasReply();
+  base::string16 GetReplyPlaceholder() const;
-  std::vector<brightray::NotificationAction> GetActions();
+  bool GetHasReply() const;
+  std::vector<brightray::NotificationAction> GetActions() const;
 
   // Prop Setters
   void SetTitle(const base::string16& new_title);
+  void SetSubtitle(const base::string16& new_subtitle);
   void SetBody(const base::string16& new_body);
   void SetSilent(bool new_silent);
   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
@@ -64,6 +66,7 @@ class Notification : public mate::TrackableObject<Notification>,
 
  private:
   base::string16 title_;
+  base::string16 subtitle_;
   base::string16 body_;
   gfx::Image icon_;
   base::string16 icon_path_;

brightray/browser/mac/cocoa_notification.mm

@@ -27,6 +27,7 @@ CocoaNotification::~CocoaNotification() {
 void CocoaNotification::Show(const NotificationOptions& options) {
   notification_.reset([[NSUserNotification alloc] init]);
   [notification_ setTitle:base::SysUTF16ToNSString(options.title)];
+  [notification_ setSubtitle:base::SysUTF16ToNSString(options.subtitle)];
   [notification_ setInformativeText:base::SysUTF16ToNSString(options.msg)];
 
   if ([notification_ respondsToSelector:@selector(setContentImage:)] &&

brightray/browser/notification.h

@@ -25,6 +25,7 @@ struct NotificationAction {
 
 struct NotificationOptions {
   base::string16 title;
+  base::string16 subtitle;
   base::string16 msg;
   std::string tag;
   GURL icon_url;

docs/api/notification.md

@@ -31,7 +31,8 @@ Returns `Boolean` - Whether or not desktop notifications are supported on the cu
 
 * `options` Object
   * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown
-  * `body` String - The body text of the notification, which will be displayed below the title
+  * `subtitle` String - A subtitle for the notification, which will be displayed below the title. _macOS_
+  * `body` String - The body text of the notification, which will be displayed below the title or subtitle
   * `silent` Boolean - (optional) Whether or not to emit an OS notification noise when showing the notification
   * `icon` [NativeImage](native-image.md) - (optional) An icon to use in the notification
   * `hasReply` Boolean - (optional) Whether or not to add an inline reply option to the notification.  _macOS_