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

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

Issue 23622035: x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | « ui/base/x/events_x.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc » ('j') | 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 0f4ebaed6c31c952884a8bc5b792e4c0603ad5b3..ee36af34405d73568271322e906a81be2a9eb3fb 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,11 @@ DesktopDragDropClientAuraX11::X11DragContext::X11DragContext(
// created by some other process. Listen for messages on it.
base::MessagePumpX11::Current()->AddDispatcherForWindow(
this, source_window_);
- XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
- source_window_, PropertyChangeMask);
+ XSelectInput(ui::GetXDisplay(), source_window_, PropertyChangeMask);
// 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 +288,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),
« no previous file with comments | « ui/base/x/events_x.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698