diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
| commit | 9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634 (patch) | |
| tree | 3b7332926a05a1c8382eb27422c385b56b29cb24 /app/surface | |
| parent | a12f7fbe12afffb4b1b31ec0d6b0988f1f9a6554 (diff) | |
| download | chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.zip chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.gz chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.bz2 | |
Move a bunch of random other files to src/ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6257006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/surface')
| -rw-r--r-- | app/surface/transport_dib.h | 2 | ||||
| -rw-r--r-- | app/surface/transport_dib_linux.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/surface/transport_dib.h b/app/surface/transport_dib.h index d82c346..a55f624 100644 --- a/app/surface/transport_dib.h +++ b/app/surface/transport_dib.h @@ -15,7 +15,7 @@ #if defined(OS_WIN) #include <windows.h> #elif defined(USE_X11) -#include "app/x11_util.h" +#include "ui/base/x/x11_util.h" #endif namespace skia { diff --git a/app/surface/transport_dib_linux.cc b/app/surface/transport_dib_linux.cc index 9976e50..549ee52 100644 --- a/app/surface/transport_dib_linux.cc +++ b/app/surface/transport_dib_linux.cc @@ -8,11 +8,11 @@ #include <sys/shm.h> #include "app/surface/transport_dib.h" -#include "app/x11_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "gfx/size.h" #include "skia/ext/platform_canvas.h" +#include "ui/base/x/x11_util.h" // The shmat system call uses this as it's invalid return address static void *const kInvalidAddress = (void*) -1; @@ -33,7 +33,7 @@ TransportDIB::~TransportDIB() { if (x_shm_) { DCHECK(display_); - x11_util::DetachSharedMemory(display_, x_shm_); + ui::DetachSharedMemory(display_, x_shm_); } } @@ -128,7 +128,7 @@ TransportDIB::Handle TransportDIB::handle() const { XID TransportDIB::MapToX(Display* display) { if (!x_shm_) { - x_shm_ = x11_util::AttachSharedMemory(display, key_); + x_shm_ = ui::AttachSharedMemory(display, key_); display_ = display; } |