gfx::Screen: Replace GetWindowUnderCursor() with IsWindowUnderCursor().

ash/display/screen_ash.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/screen_ash.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
@@ skipping 20 matching lines @@
 
 class ScreenForShutdown : public display::Screen {
  public:
   explicit ScreenForShutdown(ScreenAsh* screen_ash)
       : display_list_(screen_ash->GetAllDisplays()),
         primary_display_(screen_ash->GetPrimaryDisplay()) {
   }
 
   // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
-  gfx::NativeWindow GetWindowUnderCursor() override { return NULL; }
+  bool IsWindowUnderCursor(gfx::NativeWindow window) override { return false; }
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
     return NULL;
   }
   int GetNumDisplays() const override { return display_list_.size(); }
   std::vector<display::Display> GetAllDisplays() const override {
     return display_list_;
   }
   display::Display GetDisplayNearestWindow(
       gfx::NativeView view) const override {
     return primary_display_;
@@ skipping 45 matching lines @@
 
 void ScreenAsh::NotifyDisplayRemoved(const display::Display& display) {
   FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 gfx::Point ScreenAsh::GetCursorScreenPoint() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
 
-gfx::NativeWindow ScreenAsh::GetWindowUnderCursor() {
+bool ScreenAsh::IsWindowUnderCursor(gfx::NativeWindow window) {
   return GetWindowAtScreenPoint(
-      display::Screen::GetScreen()->GetCursorScreenPoint());
+             display::Screen::GetScreen()->GetCursorScreenPoint()) == window;
 }
 
 gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
   aura::Window* root_window =
       wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(point));
   aura::client::ScreenPositionClient* position_client =
       aura::client::GetScreenPositionClient(root_window);
 
   gfx::Point local_point = point;
   if (position_client)
@@ skipping 68 matching lines @@
 
 void ScreenAsh::RemoveObserver(display::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 display::Screen* ScreenAsh::CloneForShutdown() {
   return new ScreenForShutdown(this);
 }
 
 }  // namespace ash