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..db6cd44577891f6055f1794cf838b2ab6c94708c 100644
--- a/ui/base/x/selection_owner.h
+++ b/ui/base/x/selection_owner.h
@@ -65,8 +65,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 +85,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