Replace TOUCH_UI condition in WebUI with dynamic flag.

chrome/browser/resources/options/options.js

 // 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.
 
 var AddLanguageOverlay = options.AddLanguageOverlay;
 var AdvancedOptions = options.AdvancedOptions;
 var AlertOverlay = options.AlertOverlay;
 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
 var AutofillOptions = options.AutofillOptions;
@@ skipping 85 matching lines @@
     OptionsPage.registerSubPage(
         new OptionsPage('languageMozc',
                         templateData.languageMozcPageTabTitle,
                         'languageMozcPage'),
         LanguageOptions.getInstance());
     OptionsPage.registerSubPage(
         new OptionsPage('languagePinyin',
                         templateData.languagePinyinPageTabTitle,
                         'languagePinyinPage'),
         LanguageOptions.getInstance());
-    if (cr.isTouch) {
+    if ($('language-options-virtual-keyboard')) {

[arv (Not doing code reviews), 2011/11/30 17:36:06]

This looks a bit ad hoc. I kind of preferred the old way here.

[Rick Byers, 2011/12/01 01:21:44]

Yeah, I debated this.  We could plumb through a new cr.hasVirtualKeyboard flag
(we can't use cr.isTouchOptimized because that's no longer connected with there
being support for virtual keyboards).  But really what's going on here is that
VirtualKeyboardManager.getInstance assumes that the DOM elements for the
keyboard (all under language-options-virtual-keyboard) exist.  So I thought it
actually made sense to have the DOM conditional on an ifdef, and then have the
JavaScript all conditional on what pieces are present in the DOM.  This seemed
cleaner to me then adding but-yet-another cr.isFOO property

Alternately perhaps we should convert this to a build-time condition: use <if
expr="pp_ifdef(USE_VIRTUAL_KEYBOARD)"> inside the .js file just like inside the
.html file?  It seems ugly (and confusing to IDEs) to have <if>s inside
JavaScript though.

If we want to base it off the ifdef without <if>, then perhaps instead of
cr.hasVirtualKeyboard, we should add cr.hasBuildDefine('USE_VIRTUAL_KEYBOARD') -
plumb all possible pre-processor symbols through at once rather than piecemeal? 

       OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(),
                                   LanguageOptions.getInstance());
     }
     OptionsPage.register(InternetOptions.getInstance());
   }
   OptionsPage.register(AdvancedOptions.getInstance());
   OptionsPage.registerSubPage(ContentSettings.getInstance(),
                               AdvancedOptions.getInstance(),
                               [$('privacyContentSettingsButton')]);
   OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
@@ skipping 118 matching lines @@
 
 document.addEventListener('DOMContentLoaded', load);
 
 window.onpopstate = function(e) {
   options.OptionsPage.setState(e.state);
 };
 
 window.onbeforeunload = function() {
   options.OptionsPage.willClose();
 };