| Index: chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| diff --git a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc b/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| index b32822cabb5311cf53a0876b4455ddc17abe2fc8..92478211528d48b5acdb5fe959fbfda055749b33 100644
|
| --- a/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| +++ b/chrome/browser/ui/aura/tabs/dock_info_aurax11.cc
|
| @@ -79,16 +79,11 @@ class TopMostFinder : public BaseWindowFinder {
|
| return false;
|
| }
|
|
|
| - gfx::Rect rect;
|
| - if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
|
| - // At this point we haven't found our target window, so this window is
|
| - // higher in the z-order than the target window. If this window contains
|
| - // the point, then we can stop the search now because this window is
|
| - // obscuring the target window at this point.
|
| - return true;
|
| - }
|
| -
|
| - return false;
|
| + // At this point we haven't found our target window, so this window is
|
| + // higher in the z-order than the target window. If this window contains
|
| + // the point, then we can stop the search now because this window is
|
| + // obscuring the target window at this point.
|
| + return ui::WindowContainsPoint(window, screen_loc_);
|
| }
|
|
|
| private:
|
| @@ -147,8 +142,7 @@ class LocalProcessWindowFinder : public BaseWindowFinder {
|
| if (!ui::IsWindowVisible(window))
|
| return false;
|
|
|
| - gfx::Rect rect;
|
| - if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
|
| + if (ui::WindowContainsPoint(window, screen_loc_)) {
|
| result_ = window;
|
| return true;
|
| }
|
|
|