| 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);
|
| }
|
| }
|
|
|
|
|