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

Unified Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 2372403002: Drag and drop improvements on X11. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
index 660c9e85f8a146e5dc63e0b470a2b0d90e946cdf..0dc489ce3e3a7c0c5057566dd2b13f297a407ea4 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
@@ -329,6 +329,13 @@ void DesktopDragDropClientAuraX11::X11DragContext::OnSelectionNotify(
return;
}
DCHECK(drag_drop_client_);
+
+ if (event.property == None) {
+ // The selection conversion failed. This actually happens in real life.
+ // http://crbug.com/628099
Elliot Glaysher 2016/09/27 23:39:10 Should this be an early return or a check around a
pwnall 2016/09/30 20:02:17 Done. Thank you very much for asking this question
+ return;
+ }
+
DCHECK_EQ(event.property, atom_cache_->GetAtom(kChromiumDragReciever));
scoped_refptr<base::RefCountedMemory> data;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698