Avoid blocking while mapping an X11 window

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 544f086603c026a0f0109e4cf666132ee17356e7..757b7808e08cc403f11b1e573661245b8ec18c4d 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
@@ -291,13 +291,11 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
 
   ui::X11AtomCache atom_cache_;
 
-  // Is the window mapped to the screen?
-  bool window_mapped_;
+  // Whether the window is mapped with respect to the X server.
+  bool window_mapped_in_server_;
 
-  // Should we wait for an UnmapNotify before trying to remap the window?
-  // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the
-  // server and have yet to receive an UnmapNotify.
-  bool wait_for_unmap_;
+  // Whether the window is visible with respect to Aura.
+  bool window_mapped_in_client_;
 
   // The bounds of |xwindow_|.
   gfx::Rect bounds_in_pixels_;