Removes grab input window and extra grab and ungrab in X11WholeScreenMoveLoop

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
index d4092489154ac5c4c79764bf35918fd3ddabb141..937f4465407b077b71f43bf9a68549707e8bf8d6 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h
@@ -42,6 +42,7 @@ class SelectionFormatMap;
 
 namespace views {
 class DesktopNativeCursorManager;
+class Widget;
 
 // Implements drag and drop on X11 for aura. On one side, this class takes raw
 // X11 events forwarded from DesktopWindowTreeHostLinux, while on the other, it
@@ -153,6 +154,9 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11
   // server.
   ui::SelectionFormatMap GetFormatMap() const;
 
+  // Updates the cursor by re-grabbing the pointer while in the move loop.
+  void UpdateCursor();
+
   // Handling XdndPosition can be paused while waiting for more data; this is
   // called either synchronously from OnXdndPosition, or asynchronously after
   // we've received data requested from the other window.
@@ -170,6 +174,12 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11
   // server.
   void SendXClientEvent(::Window xid, XEvent* xev);
 
+  // Sets an image to be used during the drag.
+  void SetDragImage(const gfx::ImageSkia& image, gfx::Vector2dF offset);
+
+  // Creates a window to show the drag image during the drag.
+  void CreateDragImageWindow();
+
   // A nested message loop that notifies this object of events through the
   // X11WholeScreenMoveLoopDelegate interface.
   X11WholeScreenMoveLoop move_loop_;
@@ -245,6 +255,12 @@ class VIEWS_EXPORT DesktopDragDropClientAuraX11
   gfx::NativeCursor copy_grab_cursor_;
   gfx::NativeCursor move_grab_cursor_;
 
+  // A Widget is created during the drag if there is an image available to be
+  // used during the drag.

[pkotwicz, 2014/05/12 16:04:29]

This comment is obsolete. Can you please update it?

[varkha, 2014/05/20 17:13:35]

Done.

+  scoped_ptr<Widget> drag_widget_;
+  gfx::ImageSkia drag_image_;
+  gfx::Vector2dF drag_offset_;
+
   base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);