Refactor X11ForeignWindowManager (Reland)

ui/base/x/selection_owner.h

Index: ui/base/x/selection_owner.h
diff --git a/ui/base/x/selection_owner.h b/ui/base/x/selection_owner.h
index 317a70029f0592f4f291acb00c816eae7b3ab2f9..fd2326c9752151a0f129f7ae38cf0882812439c7 100644
--- a/ui/base/x/selection_owner.h
+++ b/ui/base/x/selection_owner.h
@@ -21,6 +21,8 @@
 
 namespace ui {
 
+class XScopedEventSelector;
+
 // Owns a specific X11 selection on an X window.
 //
 // The selection owner object keeps track of which xwindow is the current
@@ -65,8 +67,7 @@ class UI_BASE_EXPORT SelectionOwner {
                         XAtom property,
                         const scoped_refptr<base::RefCountedMemory>& data,
                         int offset,
-                        base::TimeTicks timeout,
-                        int foreign_window_manager_id);
+                        base::TimeTicks timeout);
     IncrementalTransfer(const IncrementalTransfer& other);
     ~IncrementalTransfer();
 
@@ -86,10 +87,6 @@ class UI_BASE_EXPORT SelectionOwner {
     // Time when the transfer should be aborted because the selection requestor
     // is taking too long to notify us that we can send the next chunk.
     base::TimeTicks timeout;
-
-    // Used to unselect PropertyChangeMask on |window| when we are done with
-    // the data transfer.
-    int foreign_window_manager_id;
   };
 
   // Attempts to convert the selection to |target|. If the conversion is
@@ -116,6 +113,9 @@ class UI_BASE_EXPORT SelectionOwner {
   XDisplay* x_display_;
   XID x_window_;
 
+  // Events selected on the requesting window.
+  std::unique_ptr<XScopedEventSelector> requestor_events_;
+
   // The X11 selection that this instance communicates on.
   XAtom selection_name_;