Redo of Issue 8621006: Remove most obvious TOUCH_UI code.

chrome/browser/ui/gtk/constrained_window_gtk.cc

Index: chrome/browser/ui/gtk/constrained_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index 9d9f23f189636cc14daf1bb6791a6415fca918d2..3f3265314768ed3216ee30ec5f5746e576c41eba 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -16,9 +16,7 @@
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 
-#if defined(TOUCH_UI)
-#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
-#elif defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #else
@@ -135,7 +133,7 @@ void ConstrainedWindowGtk::FocusConstrainedWindow() {
 
 ConstrainedWindowGtk::TabContentsViewType*
     ConstrainedWindowGtk::ContainingView() {
-#if defined(TOOLKIT_VIEWS) && !defined(TOUCH_UI)
+#if defined(TOOLKIT_VIEWS)
   return static_cast<NativeTabContentsViewGtk*>(
       static_cast<TabContentsViewViews*>(wrapper_->view())->
           native_tab_contents_view());