From f6f7b41f0ad80a6219fc92c1facd30a1e54dde8f Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 21 Jul 2016 06:03:38 -0600 Subject: [PATCH] Fix compilation error after merge --- atom/browser/api/atom_api_web_contents.cc | 4 ++-- atom/browser/native_window.cc | 1 - vendor/brightray | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index a4b3816b5d5e..26503d6390b5 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/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); diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 287b3c1d7de0..662835ab921a 100644 --- a/atom/browser/native_window.cc +++ b/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); diff --git a/vendor/brightray b/vendor/brightray index 38bdbe0c926b..61206fc771c9 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 38bdbe0c926b47779a45f2cf5f55105cc818a89b +Subproject commit 61206fc771c936aefd2c871120b5b1dd4e1e6069