Chromium Code Reviews| 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 0f4ebaed6c31c952884a8bc5b792e4c0603ad5b3..cd394f54d47a72580a4c6fdb42c404858e41d355 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 |
| @@ -238,12 +238,12 @@ DesktopDragDropClientAuraX11::X11DragContext::X11DragContext( |
| // created by some other process. Listen for messages on it. |
| base::MessagePumpX11::Current()->AddDispatcherForWindow( |
| this, source_window_); |
| - XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(), |
| + XSelectInput(ui::GetXDisplay(), |
| source_window_, PropertyChangeMask); |
|
oshima
2013/09/17 15:05:10
ditto
sadrul
2013/09/17 15:28:44
Done.
|
| // We must perform a full sync here because we could be racing |
| // |source_window_|. |
| - XSync(base::MessagePumpX11::GetDefaultXDisplay(), False); |
| + XSync(ui::GetXDisplay(), False); |
| } else { |
| // This drag originates from an aura window within our process. This means |
| // that we can shortcut the X11 server and ask the owning SelectionOwner |
| @@ -289,7 +289,7 @@ void DesktopDragDropClientAuraX11::X11DragContext::RequestNextTarget() { |
| ::Atom target = unfetched_targets_.back(); |
| unfetched_targets_.pop_back(); |
| - XConvertSelection(base::MessagePumpX11::GetDefaultXDisplay(), |
| + XConvertSelection(ui::GetXDisplay(), |
| atom_cache_->GetAtom(kXdndSelection), |
| target, |
| atom_cache_->GetAtom(kChromiumDragReciever), |