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

Unified Diff: app/surface/transport_dib_linux.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « app/surface/transport_dib.h ('k') | app/text_elider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/surface/transport_dib_linux.cc
===================================================================
--- app/surface/transport_dib_linux.cc (revision 71854)
+++ app/surface/transport_dib_linux.cc (working copy)
@@ -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 @@
if (x_shm_) {
DCHECK(display_);
- x11_util::DetachSharedMemory(display_, x_shm_);
+ ui::DetachSharedMemory(display_, x_shm_);
}
}
@@ -128,7 +128,7 @@
XID TransportDIB::MapToX(Display* display) {
if (!x_shm_) {
- x_shm_ = x11_util::AttachSharedMemory(display, key_);
+ x_shm_ = ui::AttachSharedMemory(display, key_);
display_ = display;
}
« no previous file with comments | « app/surface/transport_dib.h ('k') | app/text_elider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698