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

@ -9,12 +9,11 @@
#include "atom/common/asar/archive.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 "native_mate/arguments.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
#include "native_mate/wrappable.h"
#include "atom/common/node_includes.h"
#include "third_party/electron_node/src/node_native_module.h"
namespace {

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 {

3
atom/common/api/atom_api_command_line.cc
View file

@ -4,6 +4,7 @@
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/strings/string_util.h"
@ -11,8 +12,6 @@
#include "native_mate/dictionary.h"
#include "services/network/public/cpp/network_switches.h"
#include "atom/common/node_includes.h"
namespace {
bool HasSwitch(const std::string& name) {

3
atom/common/api/atom_api_native_image.cc
View file

@ -14,6 +14,7 @@
#include "atom/common/native_mate_converters/gfx_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/node_includes.h"
#include "base/files/file_util.h"
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
@ -38,8 +39,6 @@
#include "ui/gfx/icon_util.h"
#endif
#include "atom/common/node_includes.h"
namespace atom {
namespace api {

6
atom/common/api/atom_bindings.cc
View file

@ -17,6 +17,8 @@
#include "atom/common/heap_snapshot.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/promise_util.h"
#include "base/logging.h"
#include "base/process/process.h"
#include "base/process/process_handle.h"
@ -28,10 +30,6 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/global_memory_dump.h"
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
// Must be the last in the includes list, otherwise the definition of chromium
// macros conflicts with node macros.
#include "atom/common/node_includes.h"
namespace atom {
namespace {

4
atom/common/api/features.cc
View file

@ -2,12 +2,10 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/common/node_includes.h"
#include "electron/buildflags/buildflags.h"
#include "native_mate/dictionary.h"
#include "printing/buildflags/buildflags.h"
// clang-format off
#include "atom/common/node_includes.h" // NOLINT(build/include_alpha)
// clang-format on
namespace {