[uber page] Migrate the virtual keyboard sub-page to a dialog

chrome/browser/resources/options2/options.js

 // Copyright (c) 2012 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 59 matching lines @@
   // BrowserOptions sub-pages.
   OptionsPage.registerSubPage(AdvancedOptions.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('advanced-settings')]);
 
   // AdvancedOptions sub-pages.
   OptionsPage.registerSubPage(ContentSettings.getInstance(),
                               AdvancedOptions.getInstance(),
                               [$('privacyContentSettingsButton')]);
 
-  if (cr.isChromeOS) {
-    // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
-    // it will assume exists) are present (i.e. if we were built with
-    // USE_VIRTUAL_KEYBOARD).
-    if ($('language-options-virtual-keyboard')) {
-      OptionsPage.registerSubPage(VirtualKeyboardManager.getInstance(),
-                                  LanguageOptions.getInstance());
-    }
-  }
-
   // ContentSettings sub-pages.
   OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(),
                               ContentSettings.getInstance());
   OptionsPage.registerSubPage(CookiesView.getInstance(),
                               ContentSettings.getInstance(),
                               [$('privacyContentSettingsButton'),
                                $('show-cookies-button')]);
   if (HandlerOptions && $('manage-handlers-button')) {
     OptionsPage.registerSubPage(HandlerOptions.getInstance(),
                                 ContentSettings.getInstance(),
@@ skipping 90 matching lines @@
     OptionsPage.registerOverlay(
         new OptionsPage('languageMozc',
                         templateData.languageMozcPageTabTitle,
                         'languageMozcPage'),
         LanguageOptions.getInstance());
     OptionsPage.registerOverlay(
         new OptionsPage('languagePinyin',
                         templateData.languagePinyinPageTabTitle,
                         'languagePinyinPage'),
         LanguageOptions.getInstance());
+    // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
+    // it will assume exists) are present (i.e. if we were built with
+    // use_virtual_keyboard=1).
+    if ($('language-options-virtual-keyboard')) {
+      OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
+                                  LanguageOptions.getInstance());
+    }
   }
   if (!cr.isWindows && !cr.isMac) {
     OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateManager.getInstance(),
                                 AdvancedOptions.getInstance(),
@@ skipping 47 matching lines @@
   options.OptionsPage.willClose();
 };
 
 /**
  * Listener for the |popstate| event.
  * @param {Event} e The |popstate| event.
  */
 window.onpopstate = function(e) {
   options.OptionsPage.setState(e.state);
 };