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

Unified Diff: ui/base/cursor/cursor_loader_x11.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: sdf 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/clipboard/clipboard_gtk.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cursor/cursor_loader_x11.cc
diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc
index e30b24cfb33e7fc4e29680261aa0edc25484c872..aa84173ff48d529d77391ae881f67487b37962ea 100644
--- a/ui/base/cursor/cursor_loader_x11.cc
+++ b/ui/base/cursor/cursor_loader_x11.cc
@@ -146,7 +146,7 @@ CursorLoader* CursorLoader::Create() {
}
CursorLoaderX11::CursorLoaderX11()
- : invisible_cursor_(CreateInvisibleCursor(), GetXDisplay()) {
+ : invisible_cursor_(CreateInvisibleCursor(), gfx::GetXDisplay()) {
}
CursorLoaderX11::~CursorLoaderX11() {
@@ -205,7 +205,7 @@ void CursorLoaderX11::LoadAnimatedCursor(int id,
}
animated_cursors_[id] = std::make_pair(
- XcursorImagesLoadCursor(GetXDisplay(), x_images), x_images);
+ XcursorImagesLoadCursor(gfx::GetXDisplay(), x_images), x_images);
// |bitmap| is owned by the resource bundle. So we do not need to free it.
}
@@ -218,7 +218,7 @@ void CursorLoaderX11::UnloadAll() {
for (AnimatedCursorMap::iterator it = animated_cursors_.begin();
it != animated_cursors_.end(); ++it) {
XcursorImagesDestroy(it->second.second); // also frees individual frames.
- XFreeCursor(GetXDisplay(), it->second.first);
+ XFreeCursor(gfx::GetXDisplay(), it->second.first);
}
}
« no previous file with comments | « ui/base/clipboard/clipboard_gtk.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698