From ed9795514efb05ee8ff1d3006b2f8c3d33aefa7f Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sun, 16 Apr 2017 17:27:36 +0300
Subject: [PATCH] Initialize wm::WMState on Windows as well

See:
https://chromium.googlesource.com/chromium/src/+/cd4f72fdeae5d12e0c7c4efc0a1a0e1d7af1e0ba/ui/views_content_client/views_content_client_main_parts_aura.cc#23

This fixes electron/electron#9197.
---
 brightray/browser/browser_main_parts.cc | 5 ++++-
 brightray/browser/browser_main_parts.h  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc
index 0aae4bcc5b..1a74d47923 100644
--- a/brightray/browser/browser_main_parts.cc
+++ b/brightray/browser/browser_main_parts.cc
@@ -25,6 +25,7 @@
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
+#include "ui/wm/core/wm_state.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ -41,7 +42,6 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/views/linux_ui/linux_ui.h"
-#include "ui/wm/core/wm_state.h"
 #endif
 
 #if defined(OS_WIN)
@@ -181,6 +181,9 @@ void BrowserMainParts::ToolkitInitialized() {
 
 #if defined(USE_AURA) && defined(USE_X11)
   views::LinuxUI::instance()->Initialize();
+#endif
+
+#if defined(USE_AURA)
   wm_state_.reset(new wm::WMState);
 #endif
 
diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h
index a0d58e7609..91aad27602 100644
--- a/brightray/browser/browser_main_parts.h
+++ b/brightray/browser/browser_main_parts.h
@@ -19,7 +19,7 @@ class ViewsDelegate;
 }
 #endif
 
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA)
 namespace wm {
 class WMState;
 }
@@ -54,7 +54,7 @@ class BrowserMainParts : public content::BrowserMainParts {
   std::unique_ptr<ViewsDelegate> views_delegate_;
 #endif
 
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA)
   std::unique_ptr<wm::WMState> wm_state_;
 #endif