diff --git a/atom/browser/api/atom_api_notification.cc b/atom/browser/api/atom_api_notification.cc index c6fd06b43e9b..ed4c4b06c099 100644 --- a/atom/browser/api/atom_api_notification.cc +++ b/atom/browser/api/atom_api_notification.cc @@ -88,8 +88,8 @@ void Notification::SetBody(const base::string16& new_body) { void Notification::SetSilent(bool new_silent) { silent_ = new_silent; } -void Notification::SetReplyPlaceholder(const base::string16& new_reply_placeholder) { - reply_placeholder_ = new_reply_placeholder; +void Notification::SetReplyPlaceholder(const base::string16& new_placeholder) { + reply_placeholder_ = new_placeholder; } void Notification::SetHasReply(bool new_has_reply) { has_reply_ = new_has_reply; @@ -118,7 +118,8 @@ void Notification::Show() { if (presenter_) { notification_ = presenter_->CreateNotification(this); if (notification_) { - notification_->Show(title_, body_, "", GURL(), icon_.AsBitmap(), silent_, has_reply_, reply_placeholder_); + notification_->Show(title_, body_, "", GURL(), icon_.AsBitmap(), silent_, + has_reply_, reply_placeholder_); } } } diff --git a/brightray/browser/notification_delegate.h b/brightray/browser/notification_delegate.h index 33c3534111f8..16eda723a5b4 100644 --- a/brightray/browser/notification_delegate.h +++ b/brightray/browser/notification_delegate.h @@ -5,9 +5,10 @@ #ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ #define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ -#include "content/public/browser/desktop_notification_delegate.h" #include +#include "content/public/browser/desktop_notification_delegate.h" + namespace brightray { class NotificationDelegate : public content::DesktopNotificationDelegate { diff --git a/brightray/browser/platform_notification_service.cc b/brightray/browser/platform_notification_service.cc index 99ab54080c22..964fa67f5218 100644 --- a/brightray/browser/platform_notification_service.cc +++ b/brightray/browser/platform_notification_service.cc @@ -31,7 +31,8 @@ void OnWebNotificationAllowed(base::WeakPtr notification, return; if (allowed) notification->Show(data.title, data.body, data.tag, data.icon, icon, - audio_muted ? true : data.silent, false, base::UTF8ToUTF16("")); + audio_muted ? true : data.silent, false, + base::UTF8ToUTF16("")); else notification->Destroy(); } diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index 8d44cbdad0f5..a14a60aaa904 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/brightray/browser/win/notification_presenter_win.cc @@ -16,7 +16,7 @@ #include "brightray/browser/win/notification_presenter_win7.h" #include "brightray/browser/win/windows_toast_notification.h" #include "content/public/browser/desktop_notification_delegate.h" -#include "content/public/common/platform_notification_data.h" +#include "content/public/common/platform_notification_data.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h"