From 75cdd9ec701fb5aeeea5115dff49e4c1f214acbd Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Wed, 13 Dec 2017 16:31:02 -0800
Subject: [PATCH] :wrench: Linter's gotta lint

---
 .../browser/win/notification_presenter_win.cc |  7 ++--
 .../browser/win/windows_toast_notification.cc | 33 +++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc
index d02f363fecea..71f166e21fad 100644
--- a/brightray/browser/win/notification_presenter_win.cc
+++ b/brightray/browser/win/notification_presenter_win.cc
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
+#include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/md5.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "base/environment.h"
 #include "base/win/windows_version.h"
 #include "brightray/browser/win/notification_presenter_win7.h"
 #include "brightray/browser/win/windows_toast_notification.h"
@@ -54,10 +54,9 @@ NotificationPresenter* NotificationPresenter::Create() {
       new NotificationPresenterWin);
   if (!presenter->Init())
     return nullptr;
-  
-  if (IsDebuggingNotifications()) {
+
+  if (IsDebuggingNotifications())
     LOG(INFO) << "Successfully created Windows notifications presenter";
-  }
 
   return presenter.release();
 }
diff --git a/brightray/browser/win/windows_toast_notification.cc b/brightray/browser/win/windows_toast_notification.cc
index c6301f55a0a0..78a8f6fc0e79 100644
--- a/brightray/browser/win/windows_toast_notification.cc
+++ b/brightray/browser/win/windows_toast_notification.cc
@@ -27,7 +27,6 @@ using ABI::Windows::Data::Xml::Dom::IXmlNode;
 using ABI::Windows::Data::Xml::Dom::IXmlNodeList;
 using ABI::Windows::Data::Xml::Dom::IXmlText;
 
-
 namespace brightray {
 
 namespace {
@@ -96,7 +95,7 @@ void WindowsToastNotification::Show(const NotificationOptions& options) {
   std::wstring icon_path = presenter_win->SaveIconToFilesystem(
     options.icon,
     options.icon_url);
-  
+
   ComPtr<IXmlDocument> toast_xml;
   if (FAILED(GetToastXml(toast_manager_.Get(), options.title, options.msg,
                          icon_path, options.silent, &toast_xml))) {
@@ -142,7 +141,7 @@ void WindowsToastNotification::Show(const NotificationOptions& options) {
 }
 
 void WindowsToastNotification::Dismiss() {
-  if (IsDebuggingNotifications()) LOG(INFO) << "Hiding notification";  
+  if (IsDebuggingNotifications()) LOG(INFO) << "Hiding notification";
   toast_notifier_->Hide(toast_notification_.Get());
 }
 
@@ -173,22 +172,28 @@ bool WindowsToastNotification::GetToastXml(
             ? ABI::Windows::UI::Notifications::ToastTemplateType_ToastText02
             : ABI::Windows::UI::Notifications::
                   ToastTemplateType_ToastImageAndText02;
-    if (FAILED(toastManager->GetTemplateContent(template_type, toast_xml)))
-      if (IsDebuggingNotifications()) LOG(INFO) << "Fetching XML template failed";    
+    if (FAILED(toastManager->GetTemplateContent(template_type, toast_xml))) {
+      if (IsDebuggingNotifications())
+        LOG(INFO) << "Fetching XML template failed";
       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;
+    }
   }
 
   // Configure the toast's notification sound
   if (silent) {
-    if (FAILED(SetXmlAudioSilent(*toast_xml)))
+    if (FAILED(SetXmlAudioSilent(*toast_xml))) {
       if (IsDebuggingNotifications()) {
-        LOG(INFO) << "Setting \"silent\" option on notification failed";  
+        LOG(INFO) << "Setting \"silent\" option on notification failed";
       }
-       
+
       return false;
+    }
   }
 
   // Configure the toast's image
@@ -413,7 +418,7 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&Notification::NotificationClicked, notification_));
-  if (IsDebuggingNotifications()) LOG(INFO) << "Notification clicked";          
+  if (IsDebuggingNotifications()) LOG(INFO) << "Notification clicked";
 
   return S_OK;
 }
@@ -424,8 +429,8 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&Notification::NotificationDismissed, notification_));
-  if (IsDebuggingNotifications()) LOG(INFO) << "Notification dismissed";                
-  
+  if (IsDebuggingNotifications()) LOG(INFO) << "Notification dismissed";
+
   return S_OK;
 }
 
@@ -435,7 +440,7 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&Notification::NotificationFailed, notification_));
-  if (IsDebuggingNotifications()) LOG(INFO) << "Notification failed";                      
+  if (IsDebuggingNotifications()) LOG(INFO) << "Notification failed";
 
   return S_OK;
 }