From 6bae1f4b44874299dd7a54abde25c5224479bb8b Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Mon, 7 Jul 2014 13:53:24 -0400 Subject: [PATCH] Set up a native screen on Windows This is needed to prevent a crash inside aura::WindowTreeHost::InitCompositor. --- brightray/browser/browser_main_parts.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 8601b0426c..ceee0d51e6 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -7,6 +7,8 @@ #include "browser/browser_context.h" #include "browser/web_ui_controller_factory.h" #include "net/proxy/proxy_resolver_v8.h" +#include "ui/gfx/screen.h" +#include "ui/views/widget/desktop_aura/desktop_screen.h" namespace brightray { @@ -24,6 +26,10 @@ void BrowserMainParts::PreMainMessageLoopRun() { new WebUIControllerFactory(browser_context_.get())); content::WebUIControllerFactory::RegisterFactory( web_ui_controller_factory_.get()); + +#if defined(OS_WIN) + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen()); +#endif } void BrowserMainParts::PostMainMessageLoopRun() {