Index: ui/surface/transport_dib.h |
=================================================================== |
--- ui/surface/transport_dib.h (revision 192629) |
+++ ui/surface/transport_dib.h (working copy) |
@@ -14,7 +14,7 @@ |
#if defined(OS_WIN) |
#include <windows.h> |
-#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) |
+#elif defined(TOOLKIT_GTK) |
#include "ui/base/x/x11_util.h" |
#endif |
@@ -80,7 +80,7 @@ |
static int fake_handle = 10; |
return reinterpret_cast<Handle>(fake_handle++); |
} |
-#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) |
+#elif defined(TOOLKIT_GTK) |
typedef int Handle; // These two ints are SysV IPC shared memory keys |
struct Id { |
// Ensure that default initialized Ids are invalid. |
@@ -186,7 +186,7 @@ |
// wire to give this transport DIB to another process. |
Handle handle() const; |
-#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) |
+#if defined(TOOLKIT_GTK) |
// Map the shared memory into the X server and return an id for the shared |
// segment. |
XID MapToX(Display* connection); |
@@ -207,7 +207,7 @@ |
// Verifies that the dib can hold a canvas of the requested dimensions. |
bool VerifyCanvasSize(int w, int h); |
-#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) |
+#if defined(TOOLKIT_GTK) |
Id key_; // SysV shared memory id |
void* address_; // mapped address |
XSharedMemoryId x_shm_; // X id for the shared segment |