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

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

Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge 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/selection_requestor.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 1870e11f5b8a92279c1d27b4cbf043e931fa600b..0f4ebaed6c31c952884a8bc5b792e4c0603ad5b3 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
@@ -236,14 +236,14 @@ DesktopDragDropClientAuraX11::X11DragContext::X11DragContext(
if (!client) {
// The window doesn't have a DesktopDragDropClientAuraX11, that means it's
// created by some other process. Listen for messages on it.
- base::MessagePumpAuraX11::Current()->AddDispatcherForWindow(
+ base::MessagePumpX11::Current()->AddDispatcherForWindow(
this, source_window_);
- XSelectInput(base::MessagePumpAuraX11::GetDefaultXDisplay(),
+ XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
source_window_, PropertyChangeMask);
// We must perform a full sync here because we could be racing
// |source_window_|.
- XSync(base::MessagePumpAuraX11::GetDefaultXDisplay(), False);
+ XSync(base::MessagePumpX11::GetDefaultXDisplay(), 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
@@ -260,7 +260,7 @@ DesktopDragDropClientAuraX11::X11DragContext::~X11DragContext() {
DesktopDragDropClientAuraX11::GetForWindow(source_window_);
if (!client) {
// Unsubscribe from message events.
- base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow(
+ base::MessagePumpX11::Current()->RemoveDispatcherForWindow(
source_window_);
}
}
@@ -289,7 +289,7 @@ void DesktopDragDropClientAuraX11::X11DragContext::RequestNextTarget() {
::Atom target = unfetched_targets_.back();
unfetched_targets_.pop_back();
- XConvertSelection(base::MessagePumpAuraX11::GetDefaultXDisplay(),
+ XConvertSelection(base::MessagePumpX11::GetDefaultXDisplay(),
atom_cache_->GetAtom(kXdndSelection),
target,
atom_cache_->GetAtom(kChromiumDragReciever),
« no previous file with comments | « ui/base/x/selection_requestor.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