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

Fix string16 init on macOS

Browse source
This commit is contained in:
Samuel Attard 2017-04-24 08:14:35 +10:00
parent 7c38633d1e
commit a4bd26fab0
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_notification.h
View file

@ -11,6 +11,7 @@
#include "atom/browser/api/trackable_object.h" #include "atom/browser/api/trackable_object.h"
#include "atom/browser/ui/notification_observer.h" #include "atom/browser/ui/notification_observer.h"
#include "base/strings/utf_string_conversions.h"
#include "native_mate/handle.h" #include "native_mate/handle.h"
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
@ -58,13 +59,13 @@ class Notification : public mate::TrackableObject<Notification>,
void NotifyPropsUpdated(); void NotifyPropsUpdated();
private: private:
base::string16 title_ = L""; base::string16 title_ = base::UTF8ToUTF16("");
base::string16 body_ = L""; base::string16 body_ = base::UTF8ToUTF16("");
gfx::Image icon_; gfx::Image icon_;
base::string16 icon_path_ = L""; base::string16 icon_path_ = base::UTF8ToUTF16("");
bool has_icon_ = false; bool has_icon_ = false;
bool silent_ = false; bool silent_ = false;
base::string16 reply_placeholder_ = L""; base::string16 reply_placeholder_ = base::UTF8ToUTF16("");
bool has_reply_ = false; bool has_reply_ = false;
int id_; int id_;