Separate Virtual Keyboard related conditionals from TouchUI

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.
@@ skipping 56 matching lines @@
             'toolkit_views%': 0,
           }],
 
           # Views are always Pure in Touch and Aura case.
           ['touchui==1 or use_aura==1', {
             'use_only_pure_views%': 1,
           }, {
             'use_only_pure_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', {
             '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)',
       'use_only_pure_views%': '<(use_only_pure_views)',
       'views_compositor%': '<(views_compositor)',
       'use_aura%': '<(use_aura)',
 
       # 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!)
@@ skipping 225 matching lines @@
     'os_posix%': '<(os_posix)',
     'use_glib%': '<(use_glib)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
     'use_skia%': '<(use_skia)',
     'use_x11%': '<(use_x11)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'chromeos%': '<(chromeos)',
     'touchui%': '<(touchui)',
+    'use_virtual_keyboard%': '<(use_virtual_keyboard)',
     'use_xi2_mt%':'<(use_xi2_mt)',
     'file_manager_extension%': '<(file_manager_extension)',
     'webui_task_manager%': '<(webui_task_manager)',
     'inside_chromium_build%': '<(inside_chromium_build)',
     'fastbuild%': '<(fastbuild)',
     'dcheck_always_on%': '<(dcheck_always_on)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
@@ skipping 414 matching lines @@
       }],
       ['use_only_pure_views==1', {
         'grit_defines': ['-D', 'use_only_pure_views'],
       }],
       ['use_aura==1', {
         'grit_defines': ['-D', 'use_aura'],
       }],
       ['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', {
         'grit_defines': ['-D', 'remoting'],
       }],
       ['use_titlecase_in_grd_files==1', {
@@ skipping 117 matching lines @@
       }],
       ['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', {
         'defines': ['FILE_MANAGER_EXTENSION=1'],
       }],
       ['webui_task_manager==1', {
@@ skipping 1564 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',
   },
 }