| Index: ash/display/screen_ash.cc
|
| diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
|
| index c6a2847c2cdbacd4d500bedb751f39930272beec..a248668ad84f7f007ca2c132bc8f0fc34fcf2db7 100644
|
| --- a/ash/display/screen_ash.cc
|
| +++ b/ash/display/screen_ash.cc
|
| @@ -90,8 +90,8 @@ gfx::Point ScreenAsh::GetCursorScreenPoint() {
|
| }
|
|
|
| bool ScreenAsh::IsWindowUnderCursor(gfx::NativeWindow window) {
|
| - return GetWindowAtScreenPoint(
|
| - display::Screen::GetScreen()->GetCursorScreenPoint()) == window;
|
| + return window->Contains(GetWindowAtScreenPoint(
|
| + display::Screen::GetScreen()->GetCursorScreenPoint()));
|
| }
|
|
|
| gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
|
| @@ -104,7 +104,7 @@ gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
|
| if (position_client)
|
| position_client->ConvertPointFromScreen(root_window, &local_point);
|
|
|
| - return root_window->GetTopWindowContainingPoint(local_point);
|
| + return root_window->GetEventHandlerForPoint(local_point);
|
| }
|
|
|
| int ScreenAsh::GetNumDisplays() const {
|
|
|