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
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/common/api/atom_api_clipboard.cc
View file

@ -6,6 +6,7 @@
#include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.h"
@ -13,8 +14,6 @@
#include "ui/base/clipboard/clipboard_format_type.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "atom/common/node_includes.h"
namespace atom {
namespace api {