Simplify the transport dib situation across our various platforms, as a

ui/surface/transport_dib_posix.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 this up?

Is there another way of handling this? Maybe explicitly calling it
transport_dib_sysv.cc and conditionally #ifdef'ing out the implementation?

+#else
+
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/posix/eintr_wrapper.h"
 #include "skia/ext/platform_canvas.h"
 
 TransportDIB::TransportDIB()
@@ skipping 71 matching lines @@
   return shared_memory_.memory();
 }
 
 TransportDIB::Id TransportDIB::id() const {
   return shared_memory_.id();
 }
 
 TransportDIB::Handle TransportDIB::handle() const {
   return shared_memory_.handle();
 }
+
+#endif