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

🔧 Linter's gotta lint

Browse source
This commit is contained in:
Felix Rieseberg 2017-12-13 16:31:02 -08:00
parent 8a8aaaf16c
commit 75cdd9ec70
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,11 +9,11 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/environment.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/md5.h" #include "base/md5.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "base/environment.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#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"
@ -54,10 +54,9 @@ NotificationPresenter* NotificationPresenter::Create() {
new NotificationPresenterWin); new NotificationPresenterWin);
if (!presenter->Init()) if (!presenter->Init())
return nullptr; return nullptr;
if (IsDebuggingNotifications()) { if (IsDebuggingNotifications())
LOG(INFO) << "Successfully created Windows notifications presenter"; LOG(INFO) << "Successfully created Windows notifications presenter";
}
return presenter.release(); return presenter.release();
} }

33
brightray/browser/win/windows_toast_notification.cc
View file

@ -27,7 +27,6 @@ using ABI::Windows::Data::Xml::Dom::IXmlNode;
using ABI::Windows::Data::Xml::Dom::IXmlNodeList; using ABI::Windows::Data::Xml::Dom::IXmlNodeList;
using ABI::Windows::Data::Xml::Dom::IXmlText; using ABI::Windows::Data::Xml::Dom::IXmlText;
namespace brightray { namespace brightray {
namespace { namespace {
@ -96,7 +95,7 @@ void WindowsToastNotification::Show(const NotificationOptions& options) {
std::wstring icon_path = presenter_win->SaveIconToFilesystem( std::wstring icon_path = presenter_win->SaveIconToFilesystem(
options.icon, options.icon,
options.icon_url); options.icon_url);
ComPtr<IXmlDocument> toast_xml; ComPtr<IXmlDocument> toast_xml;
if (FAILED(GetToastXml(toast_manager_.Get(), options.title, options.msg, if (FAILED(GetToastXml(toast_manager_.Get(), options.title, options.msg,
icon_path, options.silent, &toast_xml))) { icon_path, options.silent, &toast_xml))) {
@ -142,7 +141,7 @@ void WindowsToastNotification::Show(const NotificationOptions& options) {
} }
void WindowsToastNotification::Dismiss() { void WindowsToastNotification::Dismiss() {
if (IsDebuggingNotifications()) LOG(INFO) << "Hiding notification"; if (IsDebuggingNotifications()) LOG(INFO) << "Hiding notification";
toast_notifier_->Hide(toast_notification_.Get()); toast_notifier_->Hide(toast_notification_.Get());
} }
@ -173,22 +172,28 @@ bool WindowsToastNotification::GetToastXml(
? ABI::Windows::UI::Notifications::ToastTemplateType_ToastText02 ? ABI::Windows::UI::Notifications::ToastTemplateType_ToastText02
: ABI::Windows::UI::Notifications:: : ABI::Windows::UI::Notifications::
ToastTemplateType_ToastImageAndText02; ToastTemplateType_ToastImageAndText02;
if (FAILED(toastManager->GetTemplateContent(template_type, toast_xml))) if (FAILED(toastManager->GetTemplateContent(template_type, toast_xml))) {
if (IsDebuggingNotifications()) LOG(INFO) << "Fetching XML template failed"; if (IsDebuggingNotifications())
LOG(INFO) << "Fetching XML template failed";
return false; return false;
if (!SetXmlText(*toast_xml, title, msg)) }
if (IsDebuggingNotifications()) LOG(INFO) << "Setting text fields on template failed";
if (!SetXmlText(*toast_xml, title, msg)) {
if (IsDebuggingNotifications())
LOG(INFO) << "Setting text fields on template failed";
return false; return false;
}
} }
// Configure the toast's notification sound // Configure the toast's notification sound
if (silent) { if (silent) {
if (FAILED(SetXmlAudioSilent(*toast_xml))) if (FAILED(SetXmlAudioSilent(*toast_xml))) {
if (IsDebuggingNotifications()) { if (IsDebuggingNotifications()) {
LOG(INFO) << "Setting \"silent\" option on notification failed"; LOG(INFO) << "Setting \"silent\" option on notification failed";
} }
return false; return false;
}
} }
// Configure the toast's image // Configure the toast's image
@ -413,7 +418,7 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
content::BrowserThread::PostTask( content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE, content::BrowserThread::UI, FROM_HERE,
base::Bind(&Notification::NotificationClicked, notification_)); base::Bind(&Notification::NotificationClicked, notification_));
if (IsDebuggingNotifications()) LOG(INFO) << "Notification clicked"; if (IsDebuggingNotifications()) LOG(INFO) << "Notification clicked";
return S_OK; return S_OK;
} }
@ -424,8 +429,8 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
content::BrowserThread::PostTask( content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE, content::BrowserThread::UI, FROM_HERE,
base::Bind(&Notification::NotificationDismissed, notification_)); base::Bind(&Notification::NotificationDismissed, notification_));
if (IsDebuggingNotifications()) LOG(INFO) << "Notification dismissed"; if (IsDebuggingNotifications()) LOG(INFO) << "Notification dismissed";
return S_OK; return S_OK;
} }
@ -435,7 +440,7 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
content::BrowserThread::PostTask( content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE, content::BrowserThread::UI, FROM_HERE,
base::Bind(&Notification::NotificationFailed, notification_)); base::Bind(&Notification::NotificationFailed, notification_));
if (IsDebuggingNotifications()) LOG(INFO) << "Notification failed"; if (IsDebuggingNotifications()) LOG(INFO) << "Notification failed";
return S_OK; return S_OK;
} }