| Index: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h
|
| diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h
|
| index 34f2783a73fb34c0b661952945e0cb54e0d481bf..97b17b03e5d5b96ba12e39e61ef427065d2b2c33 100644
|
| --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h
|
| +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h
|
| @@ -43,32 +43,12 @@ class X11WholeScreenMoveLoop : public ui::PlatformEventDispatcher {
|
| // the mouse cursor. Returns true if the move-loop is completed successfully.
|
| // If the pointer-grab fails, or the move-loop is canceled by the user (e.g.
|
| // by pressing escape), then returns false.
|
| - bool RunMoveLoop(aura::Window* window, gfx::NativeCursor cursor);
|
| -
|
| - // Updates the cursor while the move loop is running.
|
| - void UpdateCursor(gfx::NativeCursor cursor);
|
| + bool RunMoveLoop(gfx::NativeCursor cursor);
|
|
|
| // Ends the RunMoveLoop() that's currently in progress.
|
| void EndMoveLoop();
|
|
|
| - // Sets an image to be used during the drag.
|
| - void SetDragImage(const gfx::ImageSkia& image, gfx::Vector2dF offset);
|
| -
|
| private:
|
| - // Grabs the pointer and keyboard, setting the mouse cursor to |cursor|.
|
| - // Returns true if the grab was successful.
|
| - bool GrabPointerAndKeyboard(gfx::NativeCursor cursor);
|
| -
|
| - // Creates an input-only window to be used during the drag.
|
| - Window CreateDragInputWindow(XDisplay* display);
|
| -
|
| - // Creates a window to show the drag image during the drag.
|
| - void CreateDragImageWindow();
|
| -
|
| - // Checks to see if |in_image| is an image that has any visible regions
|
| - // (defined as having a pixel with alpha > 32). If so, return true.
|
| - bool CheckIfIconValid();
|
| -
|
| // Dispatch mouse movement event to |delegate_| in a posted task.
|
| void DispatchMouseMovement();
|
|
|
| @@ -80,22 +60,12 @@ class X11WholeScreenMoveLoop : public ui::PlatformEventDispatcher {
|
|
|
| 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.
|
| - ::Window grab_input_window_;
|
| -
|
| base::Closure quit_closure_;
|
|
|
| - // Keeps track of whether the move-loop is cancled by the user (e.g. by
|
| + // Keeps track of whether the move-loop is canceled by the user (e.g. by
|
| // pressing escape).
|
| bool canceled_;
|
|
|
| - // 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_;
|
| XMotionEvent last_xmotion_;
|
| base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_;
|
|
|
|
|