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

chore: node_includes header no longer needs to be at the end of the list (#17090)

Browse source 
Until one of the latest version of node, the definition of the DISALLOW_COPY_AND_ASSIGN macro in node was different than in chromium. That is no longer the case, so just undefining the macro in node_includes.h works.
This commit is contained in:
Nitish Sakhawalkar 2019-03-11 17:13:43 -07:00 • committed by Samuel Attard
parent f943db7ad5
commit e77d065875
51 changed files with 52 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_net_log.cc
View file

@ -10,6 +10,7 @@
#include "atom/browser/net/system_network_context_manager.h"
#include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/node_includes.h"
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "components/net_log/chrome_net_log.h"
@ -18,8 +19,6 @@
#include "native_mate/handle.h"
#include "net/url_request/url_request_context_getter.h"
#include "atom/common/node_includes.h"
namespace {
void OnGetFilePathToCompletedLog(const atom::util::CopyablePromise& promise,