OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/tabs/window_finder.h" | 5 #include "chrome/browser/ui/views/tabs/window_finder.h" |
6 | 6 |
| 7 #include "ui/gfx/geometry/point_conversions.h" |
| 8 #include "ui/gfx/screen.h" |
7 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" | 9 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" |
8 | 10 |
| 11 namespace { |
| 12 |
| 13 float GetDeviceScaleFactor() { |
| 14 gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); |
| 15 return display.device_scale_factor(); |
| 16 } |
| 17 |
| 18 gfx::Point DIPToPixelPoint(const gfx::Point& dip_point) { |
| 19 return ToFlooredPoint(gfx::ScalePoint(dip_point, GetDeviceScaleFactor())); |
| 20 } |
| 21 |
| 22 } // anonymous namespace |
| 23 |
9 #if defined(USE_ASH) | 24 #if defined(USE_ASH) |
10 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( | 25 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
11 const gfx::Point& screen_point, | 26 const gfx::Point& screen_point, |
12 const std::set<gfx::NativeWindow>& ignore); | 27 const std::set<gfx::NativeWindow>& ignore); |
13 #endif | 28 #endif |
14 | 29 |
15 gfx::NativeWindow GetLocalProcessWindowAtPoint( | 30 gfx::NativeWindow GetLocalProcessWindowAtPoint( |
16 chrome::HostDesktopType host_desktop_type, | 31 chrome::HostDesktopType host_desktop_type, |
17 const gfx::Point& screen_point, | 32 const gfx::Point& screen_point, |
18 const std::set<gfx::NativeWindow>& ignore) { | 33 const std::set<gfx::NativeWindow>& ignore) { |
19 #if defined(USE_ASH) | 34 #if defined(USE_ASH) |
20 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) | 35 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) |
21 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 36 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); |
22 #endif | 37 #endif |
23 | 38 |
24 // The X11 server is the canonical state of what the window stacking order | 39 // The X11 server is the canonical state of what the window stacking order |
25 // is. | 40 // is. |
26 views::X11TopmostWindowFinder finder; | 41 views::X11TopmostWindowFinder finder; |
27 return finder.FindLocalProcessWindowAt(screen_point, ignore); | 42 return finder.FindLocalProcessWindowAt(DIPToPixelPoint(screen_point), ignore); |
28 } | 43 } |
OLD | NEW |