Removing the last occurences of the 'touchui' gyp flag.

BUG=105046
TEST=none


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

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

build/common.gypi

@@ -91,9 +91,6 @@
       'use_virtual_keyboard%': '<(use_virtual_keyboard)',
       'use_skia_on_mac%': '<(use_skia_on_mac)',
 
-      # The variable touchui is still present (until all clean up is done).
-      '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
@@ -369,7 +366,6 @@
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'enable_pepper_threading%': '<(enable_pepper_threading)',
     'chromeos%': '<(chromeos)',
-    'touchui%': '<(touchui)',
     'use_virtual_keyboard%': '<(use_virtual_keyboard)',
     'use_skia_on_mac%': '<(use_skia_on_mac)',
     'use_xi2_mt%':'<(use_xi2_mt)',

chrome/chrome_browser.gypi

@@ -4145,7 +4145,7 @@
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
-        ['touchui==0', {
+        ['use_virtual_keyboard==0', {
           'sources/': [
             ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
             ['exclude', '^browser/extensions/extension_input_ui_api.h'],

chrome/chrome_repack_chrome.gypi

@@ -10,9 +10,11 @@
       '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak',
       '<(grit_out_dir)/renderer_resources.pak',
       '<(grit_out_dir)/theme_resources.pak',
+      '<(grit_out_dir)/theme_resources_standard.pak',
       '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
     ],
@@ -22,17 +24,6 @@
           '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
         ]
       }],
-      ['touchui==0 or OS == "mac"', {
-        'pak_inputs': [
-          '<(grit_out_dir)/theme_resources_standard.pak',
-          '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
-        ],
-      }, {  # else: touchui!=0
-        'pak_inputs': [
-          '<(grit_out_dir)/theme_resources_large.pak',
-          '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',
-        ],
-      }],
     ],
   },
   'inputs': [