Revert of Fix X11TopmostWindowFinder

ui/views/widget/desktop_aura/x11_topmost_window_finder.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 "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
-#include <X11/Xutil.h>
-
-#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace views {
 
 X11TopmostWindowFinder::X11TopmostWindowFinder() : toplevel_(None) {
 }
 
 X11TopmostWindowFinder::~X11TopmostWindowFinder() {
 }
@@ skipping 10 matching lines @@
   for (size_t i = 0; i < local_process_windows.size(); ++i) {
     if (ShouldStopIteratingAtLocalProcessWindow(local_process_windows[i])) {
       found_local_process_window = true;
       break;
     }
   }
   if (!found_local_process_window)
     return NULL;
 
   ui::EnumerateTopLevelWindows(this);
-  return DesktopWindowTreeHostX11::GetContentWindowForXID(toplevel_);
+  return views::DesktopWindowTreeHostX11::GetContentWindowForXID(toplevel_);
 }
 
 XID X11TopmostWindowFinder::FindWindowAt(const gfx::Point& screen_loc) {
   screen_loc_ = screen_loc;
   ui::EnumerateTopLevelWindows(this);
   return toplevel_;
 }
 
 bool X11TopmostWindowFinder::ShouldStopIterating(XID xid) {
   if (!ui::IsWindowVisible(xid))
@@ skipping 16 matching lines @@
   return false;
 }
 
 bool X11TopmostWindowFinder::ShouldStopIteratingAtLocalProcessWindow(
     aura::Window* window) {
   if (ignore_.find(window) != ignore_.end())
     return false;
 
   // Currently |window|->IsVisible() always returns true.
   // TODO(pkotwicz): Fix this. crbug.com/353038
-  if (!window->IsVisible())
-    return false;
-
-  DesktopWindowTreeHostX11* host =
-      DesktopWindowTreeHostX11::GetHostForXID(
-          window->GetHost()->GetAcceleratedWidget());
-  if (!host->GetX11RootWindowOuterBounds().Contains(screen_loc_))
-    return false;
-
-  ::Region shape = host->GetWindowShape();
-  if (!shape)
-    return true;
-
-  aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(window->GetRootWindow());
-  gfx::Point window_loc(screen_loc_);
-  screen_position_client->ConvertPointFromScreen(window, &window_loc);
-  return XPointInRegion(shape, window_loc.x(), window_loc.y()) == True;
+  return window->IsVisible() &&
+      window->GetBoundsInScreen().Contains(screen_loc_);
 }
 
 }  // namespace views