diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
| commit | c4eb2947a68a9ceb064f789ded6f06ce8a5b0497 (patch) | |
| tree | 6eccf6da9f8557688cd9b6f0c2de860b81824d89 /ui/base/cursor | |
| parent | f746ee6b3e71c5688a1f774faa0602799c7118d6 (diff) | |
| download | chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.zip chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.gz chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.bz2 | |
Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h
This is to break a dependency on ui/base from ui/compositor.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/23460052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/cursor')
| -rw-r--r-- | ui/base/cursor/cursor_loader_x11.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc index e30b24c..aa84173 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); } } |