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

Fix linting issues

Browse source
This commit is contained in:
Samuel Attard 2017-05-30 19:12:36 +10:00
parent 5048425e6e
commit 686b1388b1
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_notification.cc
View file

@ -88,8 +88,8 @@ void Notification::SetBody(const base::string16& new_body) {
void Notification::SetSilent(bool new_silent) { void Notification::SetSilent(bool new_silent) {
silent_ = new_silent; silent_ = new_silent;
} }
void Notification::SetReplyPlaceholder(const base::string16& new_reply_placeholder) { void Notification::SetReplyPlaceholder(const base::string16& new_placeholder) {
reply_placeholder_ = new_reply_placeholder; reply_placeholder_ = new_placeholder;
} }
void Notification::SetHasReply(bool new_has_reply) { void Notification::SetHasReply(bool new_has_reply) {
has_reply_ = new_has_reply; has_reply_ = new_has_reply;
@ -118,7 +118,8 @@ void Notification::Show() {
if (presenter_) { if (presenter_) {
notification_ = presenter_->CreateNotification(this); notification_ = presenter_->CreateNotification(this);
if (notification_) { 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_);
} }
} }
} }

3
brightray/browser/notification_delegate.h
View file

@ -5,9 +5,10 @@
#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ #ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_ #define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
#include "content/public/browser/desktop_notification_delegate.h"
#include <string> #include <string>
#include "content/public/browser/desktop_notification_delegate.h"
namespace brightray { namespace brightray {
class NotificationDelegate : public content::DesktopNotificationDelegate { class NotificationDelegate : public content::DesktopNotificationDelegate {

3
brightray/browser/platform_notification_service.cc
View file

@ -31,7 +31,8 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
return; return;
if (allowed) if (allowed)
notification->Show(data.title, data.body, data.tag, data.icon, icon, 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 else
notification->Destroy(); notification->Destroy();
} }

2
brightray/browser/win/notification_presenter_win.cc
View file

@ -16,7 +16,7 @@
#include "brightray/browser/win/notification_presenter_win7.h" #include "brightray/browser/win/notification_presenter_win7.h"
#include "brightray/browser/win/windows_toast_notification.h" #include "brightray/browser/win/windows_toast_notification.h"
#include "content/public/browser/desktop_notification_delegate.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 "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h" #include "ui/gfx/codec/png_codec.h"