| 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 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" | 6 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
| 7 | 7 |
| 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( | 8 gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
| 15 const gfx::Point& screen_point, | 9 const gfx::Point& screen_point, |
| 16 const std::set<gfx::NativeWindow>& ignore) { | 10 const std::set<gfx::NativeWindow>& ignore) { |
| 17 gfx::NativeWindow mus_result = nullptr; | 11 gfx::NativeWindow mus_result = nullptr; |
| 18 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) | 12 if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) |
| 19 return mus_result; | 13 return mus_result; |
| 20 | 14 |
| 21 return GetLocalProcessWindowAtPointAsh(screen_point, ignore); | 15 NOTREACHED() << "For Ozone builds, only --mash launch is supported for now."; |
| 16 return nullptr; |
| 22 } | 17 } |
| OLD | NEW |