Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
index f7495f0a2fce6bf4c2abb9161dd107de56a524b9..ccd98ac9b4bcfdf5afc001e54e7e840815277888 100644 |
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
@@ -940,10 +940,10 @@ void DesktopWindowTreeHostX11::SizeConstraintsChanged() { |
// DesktopWindowTreeHostX11, aura::WindowTreeHost implementation: |
gfx::Transform DesktopWindowTreeHostX11::GetRootTransform() const { |
- gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); |
+ gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay(); |
if (window_mapped_) { |
aura::Window* win = const_cast<aura::Window*>(window()); |
- display = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(win); |
+ display = gfx::Screen::GetScreen()->GetDisplayNearestWindow(win); |
} |
float scale = display.device_scale_factor(); |
@@ -1536,9 +1536,9 @@ void DesktopWindowTreeHostX11::ConvertEventToDifferentHost( |
DesktopWindowTreeHostX11* host) { |
DCHECK_NE(this, host); |
const gfx::Display display_src = |
- gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(window()); |
+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(window()); |
const gfx::Display display_dest = |
- gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(host->window()); |
+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(host->window()); |
DCHECK_EQ(display_src.device_scale_factor(), |
display_dest.device_scale_factor()); |
gfx::Vector2d offset = GetLocationOnNativeScreen() - |