From 624b63a1cabf50e218b450c33847ddf6126d43dc Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Mon, 28 Aug 2017 18:27:03 +0300 Subject: [PATCH] Move "atom/common/node_includes.h" to the end of the includes list https://github.com/electron/electron/issues/10363 --- atom/browser/api/atom_api_notification.cc | 4 +++- atom/browser/api/atom_api_web_view_manager.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/atom/browser/api/atom_api_notification.cc b/atom/browser/api/atom_api_notification.cc index e1854ee54695..681f5842b8c8 100644 --- a/atom/browser/api/atom_api_notification.cc +++ b/atom/browser/api/atom_api_notification.cc @@ -9,13 +9,15 @@ #include "atom/common/native_mate_converters/gfx_converter.h" #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 "brightray/browser/browser_client.h" #include "native_mate/constructor.h" #include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "url/gurl.h" +// Must be the last in the includes list. +// See https://github.com/electron/electron/issues/10363 +#include "atom/common/node_includes.h" namespace mate { template<> diff --git a/atom/browser/api/atom_api_web_view_manager.cc b/atom/browser/api/atom_api_web_view_manager.cc index 961cb032200f..d145fb15fb6e 100644 --- a/atom/browser/api/atom_api_web_view_manager.cc +++ b/atom/browser/api/atom_api_web_view_manager.cc @@ -7,10 +7,12 @@ #include "atom/browser/web_view_manager.h" #include "atom/common/native_mate_converters/content_converter.h" #include "atom/common/native_mate_converters/value_converter.h" -#include "atom/common/node_includes.h" #include "atom/common/options_switches.h" #include "content/public/browser/browser_context.h" #include "native_mate/dictionary.h" +// Must be the last in the includes list. +// See https://github.com/electron/electron/issues/10363 +#include "atom/common/node_includes.h" using atom::WebContentsPreferences;