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 <shobjidl.h> | 7 #include <shobjidl.h> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/win/scoped_gdi_object.h" | 10 #include "base/win/scoped_gdi_object.h" |
11 #include "base/win/windows_version.h" | 11 #include "base/win/windows_version.h" |
| 12 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
12 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
13 #include "ui/display/win/screen_win.h" | 14 #include "ui/display/win/screen_win.h" |
14 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" | 15 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
15 #include "ui/views/win/hwnd_util.h" | 16 #include "ui/views/win/hwnd_util.h" |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 // BaseWindowFinder ----------------------------------------------------------- | 20 // BaseWindowFinder ----------------------------------------------------------- |
20 | 21 |
21 // Base class used to locate a window. This is intended to be used with the | 22 // Base class used to locate a window. This is intended to be used with the |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 hwnd_set.insert(w); | 229 hwnd_set.insert(w); |
229 } | 230 } |
230 return hwnd_set; | 231 return hwnd_set; |
231 } | 232 } |
232 | 233 |
233 } // namespace | 234 } // namespace |
234 | 235 |
235 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( | 236 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
236 const gfx::Point& screen_point, | 237 const gfx::Point& screen_point, |
237 const std::set<gfx::NativeWindow>& ignore) { | 238 const std::set<gfx::NativeWindow>& ignore) { |
| 239 gfx::NativeWindow out; |
| 240 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &out)) |
| 241 return out; |
| 242 |
238 return LocalProcessWindowFinder::GetProcessWindowAtPoint( | 243 return LocalProcessWindowFinder::GetProcessWindowAtPoint( |
239 screen_point, RemapIgnoreSet(ignore)); | 244 screen_point, RemapIgnoreSet(ignore)); |
240 } | 245 } |
OLD | NEW |