A few less TOUCH_UIs.

R=pkotwicz@chromium.org
BUG=None
TEST=None


Review URL: http://codereview.chromium.org/8547014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111048 0039d316-1c4b-4281-b951-d872f2087c98

ui/gfx/compositor/layer.h

@@ -179,7 +179,7 @@ class COMPOSITOR_EXPORT Layer :
   void DrawTree();
 
   // Sometimes the Layer is being updated by something other than SetCanvas
-  // (e.g. the GPU process on TOUCH_UI).
+  // (e.g. the GPU process on UI_COMPOSITOR_IMAGE_TRANSPORT).
   bool layer_updated_externally() const { return layer_updated_externally_; }
 
   // WebLayerClient

ui/gfx/compositor/test/test_compositor_host_linux.cc

@@ -13,7 +13,7 @@
 
 #include <X11/Xlib.h>
 
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
 #include "base/message_pump_x.h"
 #endif
 
@@ -34,7 +34,7 @@ class TestCompositorHostLinux : public TestCompositorHost,
   virtual void ScheduleDraw() OVERRIDE;
 
   // Overridden from MessagePumpDispatcher:
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
   virtual base::MessagePumpDispatcher::DispatchStatus
     Dispatch(XEvent* xev) OVERRIDE;
 #elif defined(TOOLKIT_USES_GTK)
@@ -94,7 +94,7 @@ void TestCompositorHostLinux::ScheduleDraw() {
     compositor_->Draw(false);
 }
 
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
 base::MessagePumpDispatcher::DispatchStatus TestCompositorHostLinux::Dispatch(
     XEvent* xev) {
   return MessagePumpDispatcher::EVENT_IGNORED;