Fix compilation error after merge

atom/browser/api/atom_api_web_contents.cc

@@ -66,7 +66,7 @@
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 #include "atom/common/node_includes.h"
 
@@ -1274,7 +1274,7 @@ void WebContents::CapturePage(mate::Arguments* args) {
   gfx::Size bitmap_size = view_size;
   const gfx::NativeView native_view = view->GetNativeView();
   const float scale =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
+      display::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
       .device_scale_factor();
   if (scale > 1.0f)
     bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);

atom/browser/native_window.cc

@@ -38,7 +38,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_conversions.h"
-#include "ui/display/screen.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);

vendor/brightray

@@ -1 +1 @@
-Subproject commit 38bdbe0c926b47779a45f2cf5f55105cc818a89b
+Subproject commit 61206fc771c936aefd2c871120b5b1dd4e1e6069