From a4bd26fab0e00743f1f5ff8a55a73e0995e236b7 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 24 Apr 2017 08:14:35 +1000 Subject: [PATCH] Fix string16 init on macOS --- atom/browser/api/atom_api_notification.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_notification.h b/atom/browser/api/atom_api_notification.h index fcfc867014..6704b84f46 100644 --- a/atom/browser/api/atom_api_notification.h +++ b/atom/browser/api/atom_api_notification.h @@ -11,6 +11,7 @@ #include "atom/browser/api/trackable_object.h" #include "atom/browser/ui/notification_observer.h" +#include "base/strings/utf_string_conversions.h" #include "native_mate/handle.h" #include "ui/gfx/image/image.h" @@ -58,13 +59,13 @@ class Notification : public mate::TrackableObject, void NotifyPropsUpdated(); private: - base::string16 title_ = L""; - base::string16 body_ = L""; + base::string16 title_ = base::UTF8ToUTF16(""); + base::string16 body_ = base::UTF8ToUTF16(""); gfx::Image icon_; - base::string16 icon_path_ = L""; + base::string16 icon_path_ = base::UTF8ToUTF16(""); bool has_icon_ = false; bool silent_ = false; - base::string16 reply_placeholder_ = L""; + base::string16 reply_placeholder_ = base::UTF8ToUTF16(""); bool has_reply_ = false; int id_;