Do not release capture when starting a move loop on Desktop Linux

ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/vector2d_f.h"
 #include "ui/views/widget/desktop_aura/x11_move_loop.h"
 #include "ui/views/widget/desktop_aura/x11_move_loop_delegate.h"
 
 typedef struct _XDisplay XDisplay;
 
 namespace aura {
@@ skipping 20 matching lines @@
   virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
   virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
 
   // X11MoveLoop:
   virtual bool RunMoveLoop(aura::Window* window,
                            gfx::NativeCursor cursor) OVERRIDE;
   virtual void UpdateCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void EndMoveLoop() OVERRIDE;
 
  private:
-  // Grabs the pointer and keyboard, setting the mouse cursor to |cursor|.
-  // Returns true if the grab was successful.
-  bool GrabPointerAndKeyboard(gfx::NativeCursor cursor);
+  // Grabs the pointer, setting the mouse cursor to |cursor|. Returns true if
+  // successful.
+  bool GrabPointer(gfx::NativeCursor cursor);
+
+  // Grabs the keyboard. Returns true if successful.
+  bool GrabKeyboard();
 
   // Creates an input-only window to be used during the drag.
   Window CreateDragInputWindow(XDisplay* display);
 
   // Dispatch mouse movement event to |delegate_| in a posted task.
   void DispatchMouseMovement();
 
   X11MoveLoopDelegate* delegate_;
 
   // Are we running a nested message loop from RunMoveLoop()?
   bool in_move_loop_;
   scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_;
 
+  // Cursor in use prior to the move loop starting. Restored when the move loop
+  // quits.
+  gfx::NativeCursor initial_cursor_;
+
   bool should_reset_mouse_flags_;
 
-  // An invisible InputOnly window . We create this window so we can track the
-  // cursor wherever it goes on screen during a drag, since normal windows
-  // don't receive pointer motion events outside of their bounds.
+  // An invisible InputOnly window. Keyboard grab and sometimes mouse grab
+  // are set on this window.
   ::Window grab_input_window_;
 
+  // Whether the pointer was grabbed on |grab_input_window_|.
+  bool grabbed_pointer_;
+
   base::Closure quit_closure_;
 
   // Keeps track of whether the move-loop is cancled by the user (e.g. by
   // pressing escape).
   bool canceled_;
 
-  // Keeps track of whether we still have a pointer grab at the end of the loop.
-  bool has_grab_;
-
   XMotionEvent last_xmotion_;
   base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_