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 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" | |
6 | 7 |
7 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
8 | 9 |
9 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( | 10 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( |
10 const gfx::Point& screen_point, | 11 const gfx::Point& screen_point, |
11 const std::set<gfx::NativeWindow>& ignore); | 12 const std::set<gfx::NativeWindow>& ignore); |
12 | 13 |
13 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( | 14 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
14 const gfx::Point& screen_point, | 15 const gfx::Point& screen_point, |
15 const std::set<gfx::NativeWindow>& ignore) { | 16 const std::set<gfx::NativeWindow>& ignore) { |
17 gfx::NativeWindow out; | |
sky
2016/10/31 20:33:20
out is descriptive, maybe mus_result? (same commen
tonikitoo
2016/10/31 21:09:13
Done.
| |
18 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &out)) | |
19 return out; | |
20 | |
16 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 21 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); |
17 } | 22 } |
OLD | NEW |