OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 | |
fwang
2016/11/03 07:56:22
Why this new line?
tonikitoo
2016/11/03 12:52:29
should not be needed. Will fix.
BTW, window_finde
| |
6 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" | 7 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
7 | 8 |
8 #include "ui/aura/window.h" | |
9 | |
10 gfx::NativeWindow GetLocalProcessWindowAtPointAsh( | |
11 const gfx::Point& screen_point, | |
12 const std::set<gfx::NativeWindow>& ignore); | |
13 | |
14 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( | 9 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
15 const gfx::Point& screen_point, | 10 const gfx::Point& screen_point, |
16 const std::set<gfx::NativeWindow>& ignore) { | 11 const std::set<gfx::NativeWindow>& ignore) { |
17 gfx::NativeWindow mus_result = nullptr; | 12 gfx::NativeWindow mus_result = nullptr; |
18 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) | 13 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) |
19 return mus_result; | 14 return mus_result; |
20 | 15 |
21 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 16 NOTREACHED() << "For Ozone builds, only --mash launch is supported for now."; |
17 return nullptr; | |
22 } | 18 } |
OLD | NEW |