Remove ibus checking script from views.gyp and add use_ibus=1 option

views/views.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'conditions': [
@@ skipping 404 matching lines @@
             'widget/child_window_message_processor.cc',
             'widget/child_window_message_processor.h',
             'widget/aero_tooltip_manager.cc',
             'widget/root_view_drop_target.cc',
             'widget/widget_win.cc',
             'window/hit_test.cc',
             'window/native_frame_view.cc',
           ],
         }],
         ['touchui==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:ibus',
-          ],
           'defines': ['TOUCH_UI=1'],
           'sources/': [
             ['exclude', 'focus/accelerator_handler_gtk.cc'],
             ['exclude', 'controls/menu/native_menu_gtk.cc'],
           ],
           'conditions': [
             ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', {
               # Exclude TouchFactory if XInput2 is not available.
               'sources/': [
                 ['exclude', 'touchui/touch_factory.cc'],
                 ['exclude', 'touchui/touch_factory.h'],
               ],
             }],
-            # TODO(suzhe): We should not check ibus version here. Instead, we
-            # should use a variable to control whether or not to use ibus.
-            ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', {
-              'defines': ['HAVE_IBUS=1'],
+            ['use_ibus==1', {
+              'defines' : ['HAVE_IBUS=1'],

[Paweł Hajdan Jr., 2011/04/27 19:06:05]

I think it's generally more maintainable to have 'defines': ['HAVE_IBUS=1'] in
direct_dependent_settings in system.gyp:ibus instead of here.

[Peng, 2011/04/27 19:41:16]

Done.

+              'dependencies': [
+                '../build/linux/system.gyp:ibus',
+              ],
               'sources/': [
                 ['exclude', 'ime/input_method_gtk.cc'],
                 ['exclude', 'ime/input_method_gtk.h'],
               ],
-            }, { # else: no ibus
+            }, { # else: use_ibus != 1
               'sources/': [
                 ['exclude', 'ime/input_method_ibus.cc'],
                 ['exclude', 'ime/input_method_ibus.h'],
               ],
             }],
           ],
         }, { # else: touchui != 1
           'sources!': [
             'ime/input_method_ibus.cc',
             'ime/input_method_ibus.h',
@@ skipping 167 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: