Move "atom/common/node_includes.h" to the end of the includes list
https://github.com/electron/electron/issues/10363
This commit is contained in:
parent
3a7b3ba95e
commit
624b63a1ca
2 changed files with 6 additions and 2 deletions
|
@ -9,13 +9,15 @@
|
||||||
#include "atom/common/native_mate_converters/gfx_converter.h"
|
#include "atom/common/native_mate_converters/gfx_converter.h"
|
||||||
#include "atom/common/native_mate_converters/image_converter.h"
|
#include "atom/common/native_mate_converters/image_converter.h"
|
||||||
#include "atom/common/native_mate_converters/string16_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 "base/strings/utf_string_conversions.h"
|
||||||
#include "brightray/browser/browser_client.h"
|
#include "brightray/browser/browser_client.h"
|
||||||
#include "native_mate/constructor.h"
|
#include "native_mate/constructor.h"
|
||||||
#include "native_mate/dictionary.h"
|
#include "native_mate/dictionary.h"
|
||||||
#include "native_mate/object_template_builder.h"
|
#include "native_mate/object_template_builder.h"
|
||||||
#include "url/gurl.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 {
|
namespace mate {
|
||||||
template<>
|
template<>
|
||||||
|
|
|
@ -7,10 +7,12 @@
|
||||||
#include "atom/browser/web_view_manager.h"
|
#include "atom/browser/web_view_manager.h"
|
||||||
#include "atom/common/native_mate_converters/content_converter.h"
|
#include "atom/common/native_mate_converters/content_converter.h"
|
||||||
#include "atom/common/native_mate_converters/value_converter.h"
|
#include "atom/common/native_mate_converters/value_converter.h"
|
||||||
#include "atom/common/node_includes.h"
|
|
||||||
#include "atom/common/options_switches.h"
|
#include "atom/common/options_switches.h"
|
||||||
#include "content/public/browser/browser_context.h"
|
#include "content/public/browser/browser_context.h"
|
||||||
#include "native_mate/dictionary.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;
|
using atom::WebContentsPreferences;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue