Remove TOUCH_UI definition and make use_virtual_keyboard an independant var.

build/common.gypi

 # Copyright (c) 2011 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
   'variables': {
     # Putting a variables dict inside another variables dict looks kind of
     # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
     # variables within the outer variables dict here.  This is necessary
     # to get these variables defined for the conditions within this variables
     # dict that operate on these variables (e.g., for setting 'toolkit_views',
     # we need to have 'chromeos' already set).
     'variables': {
       'variables': {
         'variables': {
           # Whether we're building a ChromeOS build.
           'chromeos%': 0,
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
 
-          # Disable touch support by default.
-          'touchui%': 0,
-
           # Whether the compositor is enabled on views.
           'views_compositor%': 0,
 
           # Whether or not we are building with the Aura window manager.
           'use_aura%': 0,
 
           # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
           'use_openssl%': 0,
+
+          # Disable Virtual keyboard support by default.
+          'use_virtual_keyboard%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
-        'touchui%': '<(touchui)',
         'views_compositor%': '<(views_compositor)',
         'use_aura%': '<(use_aura)',
         'use_openssl%': '<(use_openssl)',
+        'use_virtual_keyboard%': '<(use_virtual_keyboard)',
 
         # WebKit compositor for ui
         'use_webkit_compositor%': 0,
 
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
             'host_arch%': 'ia32',
           }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
-          # Set default value of toolkit_views on for Windows, Chrome OS,
-          # Touch and PureView.
-          ['OS=="win" or chromeos==1 or touchui==1 or use_aura==1', {
+          # Set default value of toolkit_views based on OS.
+          ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
 
-          # Use virtual keyboard by default in TouchUI builds.
-          ['touchui==1', {
-            'use_virtual_keyboard%': 1,
-          }, {
-            'use_virtual_keyboard%': 0,
-          }],
-
-          # Use the views compositor when using the Aura window manager or
-          # touch.
-          ['use_aura==1 or touchui==1', {
+          # Use the views compositor when using the Aura window manager.
+          ['use_aura==1', {
             'views_compositor%': 1,
           }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
-      'touchui%': '<(touchui)',
-      'use_virtual_keyboard%': '<(use_virtual_keyboard)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
       'views_compositor%': '<(views_compositor)',
       'use_webkit_compositor%': '<(use_webkit_compositor)',
       'use_aura%': '<(use_aura)',
       'use_openssl%': '<(use_openssl)',
+      'use_virtual_keyboard%': '<(use_virtual_keyboard)',
+
+      # The variable touchui is still present (until all clean up is done).

[Nico, 2011/11/21 22:45:02]

Instead:

  # TODO(saintlou): Remove all references to this and then remove the variable,
http://crbug.com/yourtrackingbugid

+      'touchui%': 0,
 
       # We used to provide a variable for changing how libraries were built.
       # This variable remains until we can clean up all the users.
       # This needs to be one nested variables dict in so that dependent
       # gyp files can make use of it in their outer variables.  (Yikes!)
       # http://code.google.com/p/chromium/issues/detail?id=83308
       'library%': 'static_library',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
@@ skipping 204 matching lines @@
           'use_titlecase_in_grd_files%': 1,
         }],
 
         # Enable some hacks to support Flapper only on Chrome OS.
         ['chromeos==1', {
           'enable_flapper_hacks%': 1,
         }, {
           'enable_flapper_hacks%': 0,
         }],
 
-        # Enable file manager extension on Chrome OS, Touch, PureView, Aura.
-        ['chromeos==1 or touchui==1 or use_aura==1', {
+        # Enable file manager extension on Chrome OS or Aura.
+        ['chromeos==1 or use_aura==1', {
           'file_manager_extension%': 1,
         }, {
           'file_manager_extension%': 0,
         }],
 
         # ... except on Windows even with Aura.
         ['use_aura==1 and OS=="win"', {
           'file_manager_extension%': 0,
         }],
 
-        # Enable WebUI TaskManager always on Chrome OS, Touch or PureView.
-        ['chromeos==1 or touchui==1 or use_aura==1', {
+        # Enable WebUI TaskManager always on Chrome OS or Aura.
+        ['chromeos==1 or use_aura==1', {
           'webui_task_manager%': 1,
         }],
 
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
-        # on TOUCH_UI and linux builds with the Aura window manager
+        # on linux builds with the Aura window manager
         ['views_compositor==1 and OS=="linux"', {
           'ui_compositor_image_transport%': 1,
         }, {
           'ui_compositor_image_transport%': 0,
         }],
       ],
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
@@ skipping 462 matching lines @@
       }],
       ['toolkit_views==1', {
         'grit_defines': ['-D', 'toolkit_views'],
       }],
       ['use_aura==1', {
         'grit_defines': ['-D', 'use_aura'],
       }],
       ['use_nss==1', {
         'grit_defines': ['-D', 'use_nss'],
       }],
-      ['touchui==1', {
-        'grit_defines': ['-D', 'touchui'],
-      }],
       ['use_virtual_keyboard==1', {
         'grit_defines': ['-D', 'use_virtual_keyboard'],
       }],
       ['file_manager_extension==1', {
         'grit_defines': ['-D', 'file_manager_extension'],
       }],
       ['webui_task_manager==1', {
         'grit_defines': ['-D', 'webui_task_manager'],
       }],
       ['remoting==1', {
@@ skipping 11 matching lines @@
       }],
       ['OS=="android"', {
         'grit_defines': ['-D', 'android'],
       }],
       ['clang_use_chrome_plugins==1', {
         'clang_chrome_plugins_flags':
             '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)',
       }],
 
       # Set use_ibus to 1 to enable ibus support.
-      ['touchui==1 and chromeos==1', {
+      ['use_virtual_keyboard==1 and chromeos==1', {
         'use_ibus%': 1,
       }, {
         'use_ibus%': 0,
       }],
 
       ['enable_register_protocol_handler==1', {
         'grit_defines': ['-D', 'enable_register_protocol_handler'],
       }],
 
       ['enable_web_intents==1', {
@@ skipping 121 matching lines @@
       }],
       ['use_nss==1', {
         'defines': ['USE_NSS=1'],
       }],
       ['toolkit_uses_gtk==1', {
         'defines': ['TOOLKIT_USES_GTK=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
-      ['touchui==1', {
-        'defines': ['TOUCH_UI=1'],
-      }],
       ['use_virtual_keyboard==1', {
         'defines': ['USE_VIRTUAL_KEYBOARD=1'],
       }],
       ['use_xi2_mt!=0', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],
       ['use_wayland==1', {
         'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
       }],
       ['file_manager_extension==1', {
@@ skipping 1619 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }