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

Unified Diff: ui/surface/transport_dib_posix.cc

Issue 13582008: Simplify the transport dib situation across our various platforms, as a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | « ui/surface/transport_dib_mac.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/surface/transport_dib_posix.cc
===================================================================
--- ui/surface/transport_dib_posix.cc (revision 192091)
+++ ui/surface/transport_dib_posix.cc (working copy)
@@ -4,6 +4,15 @@
#include "ui/surface/transport_dib.h"
+#if defined(TOOLKIT_GTK)
+// The GTK-specific source file overrides this POSIX implementation.
+#elif defined(OS_LINUX) && defined(USE_AURA)
+// At the moment, Aura on Linux builds use the old-style SYSV SHM based DIBs.
+// This includes Chrome OS.
+// It will change very soon.
+#include "transport_dib_gtk.cc"
Ken Russell (switch to Gerrit) 2013/04/04 00:26:45 That's gross -- is there a timeframe for cleaning
+#else
+
#include <sys/stat.h>
#include <unistd.h>
@@ -95,3 +104,5 @@
TransportDIB::Handle TransportDIB::handle() const {
return shared_memory_.handle();
}
+
+#endif
« no previous file with comments | « ui/surface/transport_dib_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698