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

Fix build and ensure no breaking change

Browse source
This commit is contained in:
Samuel Attard 2017-12-06 07:58:48 +11:00 • committed by Cheng Zhao
parent 5f7a173d1d
commit 87c2f0f14f
8 changed files with 91 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,11 @@
#include <shlobj.h>
#include <vector>
<<<<<<< HEAD
#include "atom/browser/browser.h"
#include "base/environment.h"
=======
>>>>>>> Fix build and ensure no breaking change
#include "base/strings/utf_string_conversions.h"
#include "brightray/browser/notification_delegate.h"
#include "brightray/browser/win/notification_presenter_win.h"
@ -30,6 +33,7 @@ using ABI::Windows::Data::Xml::Dom::IXmlText;
namespace brightray {
<<<<<<< HEAD
namespace {
bool GetAppUserModelId(ScopedHString* app_id) {
@ -43,6 +47,8 @@ bool IsDebuggingNotifications() {
} // namespace
=======
>>>>>>> Fix build and ensure no breaking change
// static
ComPtr<ABI::Windows::UI::Notifications::IToastNotificationManagerStatics>
WindowsToastNotification::toast_manager_;
@ -65,7 +71,7 @@ bool WindowsToastNotification::Initialize() {
return false;
ScopedHString app_id;
if (!GetAppUserModelId(&app_id))
if (!GetAppUserModelID(&app_id))
return false;
return SUCCEEDED(