mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Overload method for naming consistency

Browse source
This commit is contained in:
Zhuo Lu 2018-01-16 19:07:54 -08:00
parent 75b990faff
commit 0b7a629a41
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/mac/cocoa_notification.h
View file

@ -28,8 +28,8 @@ class CocoaNotification : public Notification {
void NotificationDisplayed(); void NotificationDisplayed();
void NotificationReplied(const std::string& reply); void NotificationReplied(const std::string& reply);
void NotificationButtonClicked(); void NotificationActivated();
void NotificationAdditionalActionClicked(NSUserNotificationAction* action); void NotificationActivated(NSUserNotificationAction* action);
NSUserNotification* notification() const { return notification_; } NSUserNotification* notification() const { return notification_; }

4
brightray/browser/mac/cocoa_notification.mm
View file

@ -116,14 +116,14 @@ void CocoaNotification::NotificationReplied(const std::string& reply) {
this->LogAction("replied to"); this->LogAction("replied to");
} }
void CocoaNotification::NotificationButtonClicked() { void CocoaNotification::NotificationActivated() {
if (delegate()) if (delegate())
delegate()->NotificationAction(action_index_); delegate()->NotificationAction(action_index_);
this->LogAction("button clicked"); this->LogAction("button clicked");
} }
void CocoaNotification::NotificationAdditionalActionClicked(NSUserNotificationAction* action) { void CocoaNotification::NotificationActivated(NSUserNotificationAction* action) {
if (delegate()) { if (delegate()) {
unsigned index = action_index_; unsigned index = action_index_;
std::string identifier = base::SysNSStringToUTF8(action.identifier); std::string identifier = base::SysNSStringToUTF8(action.identifier);

4
brightray/browser/mac/notification_center_delegate.mm
View file

@ -38,11 +38,11 @@
if (notif.activationType == NSUserNotificationActivationTypeContentsClicked) { if (notif.activationType == NSUserNotificationActivationTypeContentsClicked) {
notification->NotificationClicked(); notification->NotificationClicked();
} else if (notif.activationType == NSUserNotificationActivationTypeActionButtonClicked) { } else if (notif.activationType == NSUserNotificationActivationTypeActionButtonClicked) {
notification->NotificationButtonClicked(); notification->NotificationActivated();
} else if (notif.activationType == NSUserNotificationActivationTypeReplied) { } else if (notif.activationType == NSUserNotificationActivationTypeReplied) {
notification->NotificationReplied([notif.response.string UTF8String]); notification->NotificationReplied([notif.response.string UTF8String]);
} else if (notif.activationType == NSUserNotificationActivationTypeAdditionalActionClicked) { } else if (notif.activationType == NSUserNotificationActivationTypeAdditionalActionClicked) {
notification->NotificationAdditionalActionClicked([notif additionalActivationAction]); notification->NotificationActivated([notif additionalActivationAction]);
} }
} }
} }