Revert of Refactor X11ForeignWindowManager

ui/base/x/selection_owner.h

 // Copyright (c) 2013 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_BASE_X_SELECTION_OWNER_H_
 #define UI_BASE_X_SELECTION_OWNER_H_
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/base/ui_base_export.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 
 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
 // owner, and when its |xwindow_|, offers different data types to other
 // processes.
 class UI_BASE_EXPORT SelectionOwner {
  public:
   SelectionOwner(XDisplay* xdisplay,
                  XID xwindow,
                  XAtom selection_name);
@@ skipping 24 matching lines @@
   void OnPropertyEvent(const XEvent& event);
 
  private:
   // Holds state related to an incremental data transfer.
   struct IncrementalTransfer {
     IncrementalTransfer(XID window,
                         XAtom target,
                         XAtom property,
                         const scoped_refptr<base::RefCountedMemory>& data,
                         int offset,
-                        base::TimeTicks timeout);
+                        base::TimeTicks timeout,
+                        int foreign_window_manager_id);
     IncrementalTransfer(const IncrementalTransfer& other);
     ~IncrementalTransfer();
 
     // Parameters from the XSelectionRequest. The data is transferred over
     // |property| on |window|.
     XID window;
     XAtom target;
     XAtom property;
 
     // The data to be transferred.
     scoped_refptr<base::RefCountedMemory> data;
 
     // The offset from the beginning of |data| of the first byte to be
     // transferred in the next chunk.
     size_t offset;
 
     // 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
   // successful, true is returned and the result is stored in the |property|
   // of |requestor|.
   bool ProcessTarget(XAtom target, XID requestor, XAtom property);
 
   // Sends the next chunk of data for given the incremental data transfer.
   void ProcessIncrementalTransfer(IncrementalTransfer* transfer);
 
   // Aborts any incremental data transfers which have timed out.
   void AbortStaleIncrementalTransfers();
 
   // Called when the transfer at |it| has completed to do cleanup.
   void CompleteIncrementalTransfer(
       std::vector<IncrementalTransfer>::iterator it);
 
   // Returns the incremental data transfer, if any, which was waiting for
   // |event|.
   std::vector<IncrementalTransfer>::iterator FindIncrementalTransferForEvent(
       const XEvent& event);
 
   // Our X11 state.
   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_;
 
   // The time that this instance took ownership of its selection.
   Time acquired_selection_timestamp_;
 
   // The maximum size of data we can put in XChangeProperty().
   size_t max_request_size_;
 
   // The data we are currently serving.
   SelectionFormatMap format_map_;
 
   std::vector<IncrementalTransfer> incremental_transfers_;
 
   // Used to abort stale incremental data transfers.
   base::RepeatingTimer incremental_transfer_abort_timer_;
 
   X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectionOwner);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_SELECTION_OWNER_H_