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" | 7 #include "ui/gfx/geometry/point_conversions.h" |
8 #include "ui/gfx/screen.h" | 8 #include "ui/gfx/screen.h" |
9 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" | 9 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 #if defined(USE_ASH) | 24 #if defined(USE_ASH) |
25 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( | 25 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
26 const gfx::Point& screen_point, | 26 const gfx::Point& screen_point, |
27 const std::set<gfx::NativeWindow>& ignore); | 27 const std::set<gfx::NativeWindow>& ignore); |
28 #endif | 28 #endif |
29 | 29 |
30 gfx::NativeWindow GetLocalProcessWindowAtPoint( | 30 gfx::NativeWindow GetLocalProcessWindowAtPoint( |
31 chrome::HostDesktopType host_desktop_type, | 31 chrome::HostDesktopType host_desktop_type, |
32 const gfx::Point& screen_point, | 32 const gfx::Point& screen_point, |
33 const std::set<gfx::NativeWindow>& ignore) { | 33 const std::set<gfx::NativeWindow>& ignore, |
| 34 gfx::NativeWindow source) { |
34 #if defined(USE_ASH) | 35 #if defined(USE_ASH) |
35 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) | 36 if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) |
36 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 37 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); |
37 #endif | 38 #endif |
38 | 39 |
39 // The X11 server is the canonical state of what the window stacking order | 40 // The X11 server is the canonical state of what the window stacking order |
40 // is. | 41 // is. |
41 views::X11TopmostWindowFinder finder; | 42 views::X11TopmostWindowFinder finder; |
42 return finder.FindLocalProcessWindowAt(DIPToPixelPoint(screen_point), ignore); | 43 return finder.FindLocalProcessWindowAt(DIPToPixelPoint(screen_point), ignore); |
43 } | 44 } |
OLD | NEW |