Chromium Code Reviews| Index: ui/views/mus/screen_mus.cc |
| diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc |
| index eb853388771be0aefb5a1c16fcb54293dcf13673..b3baf30c0766eade6eb9af228dafb8eec5582b3f 100644 |
| --- a/ui/views/mus/screen_mus.cc |
| +++ b/ui/views/mus/screen_mus.cc |
| @@ -7,6 +7,7 @@ |
| #include "mojo/converters/geometry/geometry_type_converters.h" |
| #include "services/shell/public/cpp/connection.h" |
| #include "services/shell/public/cpp/connector.h" |
| +#include "ui/aura/window.h" |
| #include "ui/display/display_observer.h" |
| #include "ui/gfx/display_finder.h" |
| #include "ui/views/mus/screen_mus_delegate.h" |
| @@ -173,9 +174,12 @@ gfx::Point ScreenMus::GetCursorScreenPoint() { |
| return delegate_->GetCursorScreenPoint(); |
| } |
| -gfx::NativeWindow ScreenMus::GetWindowUnderCursor() { |
| - NOTIMPLEMENTED(); |
| - return nullptr; |
| +bool ScreenMus::IsWindowUnderCursor(gfx::NativeWindow window) { |
| + if (!window) |
| + return false; |
| + |
| + return window->IsVisible() && |
|
sky
2016/05/02 23:59:37
IsVisible->IsDrawn
sky
2016/05/03 00:02:48
D'OH. IsVisible is what you want. Sorry.
Elliot Glaysher
2016/05/03 00:13:19
As discussed in person, this is an aura window, no
|
| + window->GetBoundsInScreen().Contains(GetCursorScreenPoint()); |
| } |
| gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { |