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

Unified Diff: ui/base/clipboard/clipboard_gtk.cc

Issue 23460052: Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
Index: ui/base/clipboard/clipboard_gtk.cc
diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc
index 85da6448c05b3639e7dffd93334bac2c8bb42c23..86f4a3c3dc3bd5954d19e8b4b68c260c4a203668 100644
--- a/ui/base/clipboard/clipboard_gtk.cc
+++ b/ui/base/clipboard/clipboard_gtk.cc
@@ -62,9 +62,9 @@ SelectionChangeObserver::SelectionChangeObserver()
clipboard_sequence_number_(0),
primary_sequence_number_(0) {
int ignored;
- if (XFixesQueryExtension(GetXDisplay(), &event_base_, &ignored)) {
- clipboard_atom_ = XInternAtom(GetXDisplay(), "CLIPBOARD", false);
- XFixesSelectSelectionInput(GetXDisplay(), GetX11RootWindow(),
+ if (XFixesQueryExtension(gfx::GetXDisplay(), &event_base_, &ignored)) {
+ clipboard_atom_ = XInternAtom(gfx::GetXDisplay(), "CLIPBOARD", false);
+ XFixesSelectSelectionInput(gfx::GetXDisplay(), GetX11RootWindow(),
clipboard_atom_,
XFixesSetSelectionOwnerNotifyMask |
XFixesSelectionWindowDestroyNotifyMask |
@@ -72,7 +72,7 @@ SelectionChangeObserver::SelectionChangeObserver()
// This seems to be semi-optional. For some reason, registering for any
// selection notify events seems to subscribe us to events for both the
// primary and the clipboard buffers. Register anyway just to be safe.
- XFixesSelectSelectionInput(GetXDisplay(), GetX11RootWindow(),
+ XFixesSelectSelectionInput(gfx::GetXDisplay(), GetX11RootWindow(),
XA_PRIMARY,
XFixesSetSelectionOwnerNotifyMask |
XFixesSelectionWindowDestroyNotifyMask |

Powered by Google App Engine
This is Rietveld 408576698