Refactor X11ForeignWindowManager (Reland)

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

 // 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.
 
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
 
 #include <X11/Xatom.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/event_types.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drop_target_event.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
 #include "ui/base/x/selection_utils.h"
-#include "ui/base/x/x11_foreign_window_manager.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/base/x/x11_window_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h"
 #include "ui/views/widget/widget.h"
@@ skipping 156 matching lines @@
   // The XID of our chrome local aura window handling our events.
   ::Window local_window_;
 
   // The XID of the window that's initiated the drag.
   unsigned long source_window_;
 
   // The DesktopDragDropClientAuraX11 for |source_window_| if |source_window_|
   // belongs to a Chrome window.
   DesktopDragDropClientAuraX11* source_client_;
 
-  // Used to unselect PropertyChangeMask on |source_window_| if |source_window_|
-  // does not belong to a Chrome window when X11DragContext is destroyed.
-  int foreign_window_manager_source_window_id_;
-
   // The client we inform once we're done with requesting data.
   DesktopDragDropClientAuraX11* drag_drop_client_;
 
   // Whether we're blocking the handling of an XdndPosition message by waiting
   // for |unfetched_targets_| to be fetched.
   bool waiting_to_handle_position_;
 
   // Where the cursor is on screen.
   gfx::Point screen_point_;
 
@@ skipping 16 matching lines @@
 
 DesktopDragDropClientAuraX11::X11DragContext::X11DragContext(
     ui::X11AtomCache* atom_cache,
     ::Window local_window,
     const XClientMessageEvent& event)
     : atom_cache_(atom_cache),
       local_window_(local_window),
       source_window_(event.data.l[0]),
       source_client_(
           DesktopDragDropClientAuraX11::GetForWindow(source_window_)),
-      foreign_window_manager_source_window_id_(0),
       drag_drop_client_(NULL),
       waiting_to_handle_position_(false),
       suggested_action_(None) {
   if (!source_client_) {
     bool get_types = ((event.data.l[1] & 1) != 0);
 
     if (get_types) {
       if (!ui::GetAtomArrayProperty(source_window_,
                                     "XdndTypeList",
                                     &unfetched_targets_)) {
         return;
       }
     } else {
       // data.l[2,3,4] contain the first three types. Unused slots can be None.
       for (int i = 0; i < 3; ++i) {
         if (event.data.l[2+i] != None) {
           unfetched_targets_.push_back(event.data.l[2+i]);
         }
       }
     }
 
     // The window doesn't have a DesktopDragDropClientAuraX11, that means it's
     // created by some other process. Listen for messages on it.
     ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
-    foreign_window_manager_source_window_id_ =
-        ui::XForeignWindowManager::GetInstance()->RequestEvents(
-            source_window_, PropertyChangeMask);
+    ui::XWindowManager::GetInstance()->SelectEvents(source_window_,
+                                                    PropertyChangeMask);
 
     // We must perform a full sync here because we could be racing
     // |source_window_|.
     XSync(gfx::GetXDisplay(), False);
   } else {
     // This drag originates from an aura window within our process. This means
     // that we can shortcut the X11 server and ask the owning SelectionOwner
     // for the data it's offering.
     fetched_targets_ = source_client_->GetFormatMap();
   }
 
   ReadActions();
 }
 
 DesktopDragDropClientAuraX11::X11DragContext::~X11DragContext() {
   if (!source_client_) {
     // Unsubscribe from message events.
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
-    ui::XForeignWindowManager::GetInstance()->CancelRequest(
-        foreign_window_manager_source_window_id_);
+    ui::XWindowManager::GetInstance()->DeselectEvents(source_window_,
+                                                      PropertyChangeMask);
   }
 }
 
 void DesktopDragDropClientAuraX11::X11DragContext::OnStartXdndPositionMessage(
     DesktopDragDropClientAuraX11* client,
     ::Atom suggested_action,
     ::Window source_window,
     const gfx::Point& screen_point) {
   DCHECK_EQ(source_window_, source_window);
   suggested_action_ = suggested_action;
@@ skipping 928 matching lines @@
     for (int x = 0; x < in_bitmap->width(); ++x) {
       if (SkColorGetA(in_row[x]) > kMinAlpha)
         return true;
     }
   }
 
   return false;
 }
 
 }  // namespace views