More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup.

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 4129 matching lines @@
           ],
         }],
         ['use_gnome_keyring==0', {
           'sources!': [
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
         ['touchui==0', {
           'sources/': [
-            ['exclude', '^browser/chromeos/login/touch_*'],
             ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
             ['exclude', '^browser/extensions/extension_input_ui_api.h'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_views_touch.cc'],
             ['exclude', '^browser/ui/touch/*'],
           ],
         }],
-        ['touchui==1', {
-          'sources/': [
-            ['include', '^browser/ui/touch/*'],
-            ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
-            ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
-            ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
-            ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'],
-            ['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
-            ['exclude', '^browser/chromeos/input_method/candidate_window.h'],
-          ],
-        }],
         # linux/chromeos only status area button.
         ['OS=="linux" and use_aura==1', {
           'sources/': [
             ['include', '^browser/chromeos/status/memory_menu_button.cc'],
             ['include', '^browser/chromeos/status/memory_menu_button.h'],
           ],
         }],
         ['use_aura==1', {
           'sources/': [
             ['exclude', '^browser/aeropeek_manager.cc'],
@@ skipping 851 matching lines @@
                 ['exclude', '^browser/ui/browser_list_stub.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
               ],
               'sources!': [
                 'browser/ui/toolbar/bookmark_sub_menu_model.cc',
               ],
             }],
-            # Touch build only
-            ['OS=="linux" and toolkit_views==1 and touchui==1', {
-              'sources/': [
-                ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
-                ['include', '^browser/ui/views/constrained_window_views.cc'],
-                ['include', '^browser/ui/views/constrained_window_views.h'],
-                ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
-                ['include', '^browser/ui/views/constrained_window_views.cc'],
-                ['include', '^browser/ui/views/constrained_window_views.h'],
-                ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
-                ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
-                ['exclude', '^browser/ui/gtk/collected_cookies_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
-                ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.h'],
-                ['exclude', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
-                ['exclude', '^browser/ui/views/constrained_html_delegate_gtk.cc'],
-                ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
-                ['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'],
-                ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'],
-              ],
-            }],
             # chromeos notifications are not used in aura.
             ['chromeos==1 and use_aura==0', {
               'sources/': [
                 ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
                 ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.h'],
                 ['exclude', '^browser/download/download_shelf.h'],
                 ['exclude', '^browser/ui/views/download/download_item_view.cc'],
@@ skipping 222 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }