Index: chrome/browser/ui/views/tabs/window_finder_x11.cc |
diff --git a/chrome/browser/ui/views/tabs/window_finder_x11.cc b/chrome/browser/ui/views/tabs/window_finder_x11.cc |
index f8418ff84060126212c8d141486ae3518a718cb9..909f5c4add7cc8a1a36ecff32beb4fba439c5aa2 100644 |
--- a/chrome/browser/ui/views/tabs/window_finder_x11.cc |
+++ b/chrome/browser/ui/views/tabs/window_finder_x11.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/ui/views/tabs/window_finder.h" |
+#include "chrome/browser/ui/views/tabs/window_finder_mus.h" |
#include "ui/display/display.h" |
#include "ui/display/screen.h" |
#include "ui/gfx/geometry/point_conversions.h" |
@@ -26,8 +27,11 @@ gfx::Point DIPToPixelPoint(const gfx::Point& dip_point) { |
gfx::NativeWindow WindowFinder::GetLocalProcessWindowAtPoint( |
const gfx::Point& screen_point, |
const std::set<gfx::NativeWindow>& ignore) { |
- // The X11 server is the canonical state of what the window stacking order |
- // is. |
+ gfx::NativeWindow mus_result = nullptr; |
+ if (GetLocalProcessWindowAtPointMus(screen_point, ignore, &mus_result)) |
+ return mus_result; |
+ |
+ // The X11 server is the canonical state of what the window stacking order is. |
views::X11TopmostWindowFinder finder; |
return finder.FindLocalProcessWindowAt(DIPToPixelPoint(screen_point), ignore); |
} |