Remove a touchui section from chrome_browser.gypi

This is bryeung CL from http://codereview.chromium.org/8748013/
which was approved by sky and failed on the commit-bot. It also improves the logic of one of my later CL in the same area.

TBR=sky@chromium.org
BUG=105046
TEST=grep *.ninja for relevant files in a large variety of configurations


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

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

chrome/browser/ui/views/frame/browser_view.cc

@@ -135,7 +135,7 @@
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
 
@@ -1951,7 +1951,7 @@ void BrowserView::Init() {
   AddChildView(contents_split_);
   set_contents_view(contents_split_);
 
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   status_bubble_.reset(new StatusBubbleTouch(contents_));
 #else
   status_bubble_.reset(new StatusBubbleViews(contents_));

chrome/chrome_browser.gypi

@@ -4054,8 +4054,6 @@
             ['exclude', 'browser/extensions/extension_input_ime_api.h'],
             ['exclude', 'browser/extensions/extension_input_method_api.cc'],
             ['exclude', 'browser/extensions/extension_input_method_api.h'],
-            ['exclude', 'browser/extensions/extension_input_ui_api.cc'],
-            ['exclude', 'browser/extensions/extension_input_ui_api.h'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
@@ -4139,14 +4137,6 @@
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
-        ['use_virtual_keyboard==0', {
-          'sources/': [
-            ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
-            ['exclude', '^browser/extensions/extension_input_ui_api.h'],
-            ['exclude', '^browser/ui/touch/status_bubble_touch.cc'],
-            ['exclude', '^browser/ui/touch/status_bubble_touch.h'],
-          ],
-        }],
         # linux/chromeos only status area button.
         ['OS=="linux" and use_aura==1', {
           'sources/': [
@@ -4251,6 +4241,8 @@
         }],
         ['use_virtual_keyboard==0', {
           'sources/': [
+            ['exclude', '^browser/extensions/extension_input_ui_api.*'],
+            ['exclude', '^browser/ui/touch/status_bubble_touch.*'],
             ['exclude', '^browser/ui/virtual_keyboard/*'],
             ['exclude', '^browser/ui/webui/keyboard_ui.*'],
           ],
@@ -4960,7 +4952,7 @@
             }],
             # Exclude extension_input_ui_api that depends on chromeos again
             # (Required because of the '^browser/extensions/' include above)
-            ['chromeos == 0', {
+            ['chromeos == 0 or use_virtual_keyboard == 0', {
               'sources/': [
                 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
                 ['exclude', '^browser/extensions/extension_input_ui_api.h'],

chrome/chrome_tests.gypi

@@ -2801,9 +2801,9 @@
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
           ],
         }],
-        ['toolkit_views==0', {
+        ['chromeos==0 or use_virtual_keyboard==0', {
           'sources!': [
-            'browser/extensions/extension_input_apitest.cc',
+            'browser/extensions/extension_input_ui_apitest.cc',
           ],
         }],
         ['configuration_policy==0', {
@@ -2967,6 +2967,7 @@
         }, { # else: toolkit_views == 0
           'sources!': [
             'browser/extensions/browser_action_test_util_views.cc',
+            'browser/extensions/extension_input_apitest.cc',
             'browser/tab_first_render_watcher_browsertest.cc',
             'browser/ui/panels/panel_browser_view_browsertest.cc',
             'browser/ui/views/browser_actions_container_browsertest.cc',