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

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <X11/extensions/shape.h>
@@ skipping 166 matching lines @@
   // window size to the monitor size causes the WM to set the EWMH for
   // fullscreen.
   gfx::Size AdjustSize(const gfx::Size& requested_size);
 
   // Called when |xwindow_|'s _NET_WM_STATE property is updated.
   void OnWMStateUpdated();
 
   // 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();
 
   // Updates |xwindow_|'s _NET_WM_USER_TIME if |xwindow_| is active.
   void UpdateWMUserTime(const ui::PlatformEvent& event);
 
   // Sends a message to the x11 window manager, enabling or disabling the
   // states |state1| and |state2|.
   void SetWMSpecState(bool enabled, ::Atom state1, ::Atom state2);
 
@@ skipping 85 matching lines @@
 
   // The window manager state bits.
   std::set< ::Atom> window_properties_;
 
   // Whether |xwindow_| was requested to be fullscreen via SetFullscreen().
   bool is_fullscreen_;
 
   // 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_;
 
   // True if a Maximize() call should be done after mapping the window.
   bool should_maximize_after_map_;
 
   // Whether we used an ARGB visual for our window.
   bool use_argb_visual_;
 
   DesktopDragDropClientAuraX11* drag_drop_client_;
@@ skipping 47 matching lines @@
   base::CancelableCallback<void()> delayed_resize_task_;
 
   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_