Revert of Fix X11TopmostWindowFinder

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index fd72e57cef6a40cfc9701eceaabd89a4f543fde0..b005f6d7ac843b329ae31bb4391f847904b5df18 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -15,7 +15,6 @@
 #include "ui/base/cursor/cursor_loader_x11.h"
 #include "ui/events/event_source.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
-#include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/views/views_export.h"
@@ -58,14 +57,6 @@
 
   // Returns the current bounds in terms of the X11 Root Window.
   gfx::Rect GetX11RootWindowBounds() const;
-
-  // Returns the current bounds in terms of the X11 Root Window including the
-  // borders provided by the window manager (if any).
-  gfx::Rect GetX11RootWindowOuterBounds() const;
-
-  // Returns the window shape if the window is not rectangular. Returns NULL
-  // otherwise.
-  ::Region GetWindowShape() const;
 
   // Called by X11DesktopHandler to notify us that the native windowing system
   // has changed our activation.
@@ -167,12 +158,6 @@
   // along with all aura client objects that direct behavior.
   aura::WindowEventDispatcher* InitDispatcher(const Widget::InitParams& params);
 
-  // Called when |xwindow_|'s _NET_WM_STATE property is updated.
-  void OnWMStateUpdated();
-
-  // Called when |xwindow_|'s _NET_FRAME_EXTENTS property is updated.
-  void OnFrameExtentsUpdated();
-
   // Sends a message to the x11 window manager, enabling or disabling the
   // states |state1| and |state2|.
   void SetWMSpecState(bool enabled, ::Atom state1, ::Atom state2);
@@ -290,14 +275,8 @@
 
   ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
 
-  // The window shape if the window is non-rectangular.
-  ::Region window_shape_;
-
-  // Whether |window_shape_| was set via SetShape().
-  bool custom_window_shape_;
-
-  // The size of the window manager provided borders (if any).
-  gfx::Insets native_window_frame_borders_;
+  // Copy of custom window shape specified via SetShape(), if any.
+  ::Region custom_window_shape_;
 
   // The current root window host that has capture. While X11 has something
   // like Windows SetCapture()/ReleaseCapture(), it is entirely implicit and