Removes grab input window and extra grab and ungrab in X11WholeScreenMoveLoop

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 
 #include <set>
 #include <X11/Xlib.h>
 
@@ skipping 23 matching lines @@
 
 namespace ui {
 class DragSource;
 class DropTargetEvent;
 class OSExchangeData;
 class OSExchangeDataProviderAuraX11;
 class SelectionFormatMap;
 }
 
 namespace views {
 class DesktopNativeCursorManager;

[pkotwicz, 2014/05/08 00:03:49]

Nit: forward declare views::Widget

[varkha, 2014/05/09 19:01:01]

Done (is also forward declared in
ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h which is why this
still compiled).

 
 // 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
 // handles the views drag events.
 class VIEWS_EXPORT DesktopDragDropClientAuraX11
     : public aura::client::DragDropClient,
       public aura::WindowObserver,
       public X11WholeScreenMoveLoopDelegate {
  public:
   DesktopDragDropClientAuraX11(
@@ skipping 87 matching lines @@
   // During the blocking StartDragAndDrop() call, this converts the views-style
   // |drag_operation_| bitfield into a vector of Atoms to offer to other
   // processes.
   std::vector< ::Atom> GetOfferedDragOperations();
 
   // This returns a representation of the data we're offering in this
   // drag. This is done to bypass an asynchronous roundtrip with the X11
   // 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.
   void CompleteXdndPosition(::Window source_window,
                             const gfx::Point& screen_point);
 
   void SendXdndEnter(::Window dest_window);
   void SendXdndLeave(::Window dest_window);
   void SendXdndPosition(::Window dest_window,
                         const gfx::Point& screen_point,
                         unsigned long time);
   void SendXdndDrop(::Window dest_window);
 
   // Sends |xev| to |xid|, optionally short circuiting the round trip to the X
   // 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_;
 
   aura::Window* root_window_;
 
   Display* xdisplay_;
   ::Window xwindow_;
 
   ui::X11AtomCache atom_cache_;
@@ skipping 45 matching lines @@
 
   // Ends the move loop if the target is too slow to respond after the mouse is
   // released.
   base::OneShotTimer<DesktopDragDropClientAuraX11> end_move_loop_timer_;
 
   // We use these cursors while dragging.
   gfx::NativeCursor grab_cursor_;
   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.
+  scoped_ptr<Widget> drag_widget_;
+  gfx::ImageSkia drag_image_;
+  gfx::Vector2dF drag_offset_;
+
   base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_