Revert of x11: Don't wait on a MapNotify on override-redirect windows.

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 30d337d98b3c0cd149280755b4f8067aa857f45b..1d3cbd7f8773b6c052e5c2115c3bec5ea79338c5 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
@@ -184,13 +184,6 @@
   // Called when |xwindow_|'s _NET_FRAME_EXTENTS property is updated.
   void OnFrameExtentsUpdated();
 
-  // Called when |xwindow_| is mapped, either directly (in the case of
-  // override-redirect windows) or in response to a MapNotify event.
-  void OnX11WindowMapped();
-
-  // Called when |xwindow_| is unmapped.
-  void OnX11WindowUnmapped();
-
   // Updates |xwindow_|'s minimum and maximum size.
   void UpdateMinAndMaxSize();
 
@@ -296,9 +289,6 @@
   // True if the window should stay on top of most other windows.
   bool is_always_on_top_;
 
-  // True if the window has the override_redirect bit set.
-  bool is_override_redirect_;
-
   // True if the window has title-bar / borders provided by the window manager.
   bool use_native_frame_;