Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

Issue 262893002: Removes grab input window and extra grab and ungrab in X11WholeScreenMoveLoop Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removes grab input window and extra grab and ungrab in X11WholeScreenMoveLoop (refactored) Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
7 7
8 #include <set> 8 #include <set>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 10
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 // During the blocking StartDragAndDrop() call, this converts the views-style 142 // During the blocking StartDragAndDrop() call, this converts the views-style
143 // |drag_operation_| bitfield into a vector of Atoms to offer to other 143 // |drag_operation_| bitfield into a vector of Atoms to offer to other
144 // processes. 144 // processes.
145 std::vector< ::Atom> GetOfferedDragOperations(); 145 std::vector< ::Atom> GetOfferedDragOperations();
146 146
147 // This returns a representation of the data we're offering in this 147 // This returns a representation of the data we're offering in this
148 // drag. This is done to bypass an asynchronous roundtrip with the X11 148 // drag. This is done to bypass an asynchronous roundtrip with the X11
149 // server. 149 // server.
150 ui::SelectionFormatMap GetFormatMap() const; 150 ui::SelectionFormatMap GetFormatMap() const;
151 151
152 // Updates the cursor by re-grabbing the pointer while in the move loop.
153 void UpdateCursor();
154
152 // Handling XdndPosition can be paused while waiting for more data; this is 155 // Handling XdndPosition can be paused while waiting for more data; this is
153 // called either synchronously from OnXdndPosition, or asynchronously after 156 // called either synchronously from OnXdndPosition, or asynchronously after
154 // we've received data requested from the other window. 157 // we've received data requested from the other window.
155 void CompleteXdndPosition(::Window source_window, 158 void CompleteXdndPosition(::Window source_window,
156 const gfx::Point& screen_point); 159 const gfx::Point& screen_point);
157 160
158 void SendXdndEnter(::Window dest_window); 161 void SendXdndEnter(::Window dest_window);
159 void SendXdndLeave(::Window dest_window); 162 void SendXdndLeave(::Window dest_window);
160 void SendXdndPosition(::Window dest_window, 163 void SendXdndPosition(::Window dest_window,
161 const gfx::Point& screen_point, 164 const gfx::Point& screen_point,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 gfx::NativeCursor move_grab_cursor_; 235 gfx::NativeCursor move_grab_cursor_;
233 236
234 base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_; 237 base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_;
235 238
236 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11); 239 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);
237 }; 240 };
238 241
239 } // namespace views 242 } // namespace views
240 243
241 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 244 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698