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 742d5f45169c4af7a384fefc8e43705d83071dc2..339fa653db305012ed61bfabba321e9dfe41000b 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,14 +43,13 @@ class X11WholeScreenMoveLoop : public X11MoveLoop, |
uint32_t DispatchEvent(const ui::PlatformEvent& event) override; |
// X11MoveLoop: |
- bool RunMoveLoop(aura::Window* window, gfx::NativeCursor cursor) override; |
+ bool RunMoveLoop(aura::Window* window) override; |
void UpdateCursor(gfx::NativeCursor cursor) override; |
void EndMoveLoop() override; |
private: |
- // Grabs the pointer, setting the mouse cursor to |cursor|. Returns true if |
- // successful. |
- bool GrabPointer(gfx::NativeCursor cursor); |
+ // Grabs the pointer on |grab_input_window_|. Returns true if successful. |
+ bool GrabPointer(); |
void GrabEscKey(); |
@@ -66,10 +65,6 @@ class X11WholeScreenMoveLoop : public X11MoveLoop, |
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. Keyboard grab and sometimes mouse grab |