From 2b9b186fd14743fd79c0fef9d78df43bb2232bd8 Mon Sep 17 00:00:00 2001
From: Charlie Hess <charlie@slack-corp.com>
Date: Thu, 17 Aug 2017 17:28:14 -0700
Subject: [PATCH] =?UTF-8?q?Rename=20soundName=20=E2=86=92=20sound.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 atom/browser/api/atom_api_notification.cc   | 10 +++++-----
 atom/browser/api/atom_api_notification.h    |  4 ++--
 brightray/browser/mac/cocoa_notification.mm |  4 ++--
 brightray/browser/notification.h            |  2 +-
 docs/api/notification.md                    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/atom/browser/api/atom_api_notification.cc b/atom/browser/api/atom_api_notification.cc
index 85ede4a3c303..325a101a3655 100644
--- a/atom/browser/api/atom_api_notification.cc
+++ b/atom/browser/api/atom_api_notification.cc
@@ -67,7 +67,7 @@ Notification::Notification(v8::Isolate* isolate,
     opts.Get("replyPlaceholder", &reply_placeholder_);
     opts.Get("hasReply", &has_reply_);
     opts.Get("actions", &actions_);
-    opts.Get("soundName", &sound_name_);
+    opts.Get("sound", &sound_);
   }
 }
 
@@ -115,7 +115,7 @@ std::vector<brightray::NotificationAction> Notification::GetActions() const {
 }
 
 base::string16 Notification::GetSoundName() const {
-  return sound_name_;
+  return sound_;
 }
 
 // Setters
@@ -148,8 +148,8 @@ void Notification::SetActions(
   actions_ = actions;
 }
 
-void Notification::SetSoundName(const base::string16& new_sound_name) {
-  sound_name_ = new_sound_name;
+void Notification::SetSoundName(const base::string16& new_sound) {
+  sound_ = new_sound;
 }
 
 void Notification::NotificationAction(int index) {
@@ -190,7 +190,7 @@ void Notification::Show() {
       options.has_reply = has_reply_;
       options.reply_placeholder = reply_placeholder_;
       options.actions = actions_;
-      options.sound_name = sound_name_;
+      options.sound = sound_;
       notification_->Show(options);
     }
   }
diff --git a/atom/browser/api/atom_api_notification.h b/atom/browser/api/atom_api_notification.h
index 2960c6777449..2050e513eb4e 100644
--- a/atom/browser/api/atom_api_notification.h
+++ b/atom/browser/api/atom_api_notification.h
@@ -64,7 +64,7 @@ class Notification : public mate::TrackableObject<Notification>,
   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
   void SetHasReply(bool new_has_reply);
   void SetActions(const std::vector<brightray::NotificationAction>& actions);
-  void SetSoundName(const base::string16& sound_name);
+  void SetSoundName(const base::string16& sound);
 
  private:
   base::string16 title_;
@@ -77,7 +77,7 @@ class Notification : public mate::TrackableObject<Notification>,
   base::string16 reply_placeholder_;
   bool has_reply_ = false;
   std::vector<brightray::NotificationAction> actions_;
-  base::string16 sound_name_;
+  base::string16 sound_;
 
   brightray::NotificationPresenter* presenter_;
 
diff --git a/brightray/browser/mac/cocoa_notification.mm b/brightray/browser/mac/cocoa_notification.mm
index 8b9cbb793def..cd7b69ef4058 100644
--- a/brightray/browser/mac/cocoa_notification.mm
+++ b/brightray/browser/mac/cocoa_notification.mm
@@ -39,8 +39,8 @@ void CocoaNotification::Show(const NotificationOptions& options) {
 
   if (options.silent) {
     [notification_ setSoundName:nil];
-  } else if (options.sound_name != nil) {
-    [notification_ setSoundName:base::SysUTF16ToNSString(options.sound_name)];
+  } else if (options.sound != nil) {
+    [notification_ setSoundName:base::SysUTF16ToNSString(options.sound)];
   } else {
     [notification_ setSoundName:NSUserNotificationDefaultSoundName];
   }
diff --git a/brightray/browser/notification.h b/brightray/browser/notification.h
index 18db3c119b47..69efcff386f5 100644
--- a/brightray/browser/notification.h
+++ b/brightray/browser/notification.h
@@ -33,7 +33,7 @@ struct NotificationOptions {
   bool silent;
   bool has_reply;
   base::string16 reply_placeholder;
-  base::string16 sound_name;
+  base::string16 sound;
   std::vector<NotificationAction> actions;
 };
 
diff --git a/docs/api/notification.md b/docs/api/notification.md
index ba89d7aa1336..eb55b97245fd 100644
--- a/docs/api/notification.md
+++ b/docs/api/notification.md
@@ -37,7 +37,7 @@ Returns `Boolean` - Whether or not desktop notifications are supported on the cu
   * `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_
   * `replyPlaceholder` String - (optional) The placeholder to write in the inline reply input field. _macOS_
-  * `soundName` String - (optional) The name of the sound file to play when the notification is shown. _macOS_
+  * `sound` String - (optional) The name of the sound file to play when the notification is shown. _macOS_
   * `actions` [NotificationAction[]](structures/notification-action.md) - (optional) Actions to add to the notification.  Please read the available actions and limitations in the `NotificationAction` documentation _macOS_