Index: chrome/browser/resources/options/options.js |
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js |
index 35c8fde50a7acc579ebba1beb1e2ec0dd92cc335..5a744f3e98e7aa9aabd313d9570734034d991263 100644 |
--- a/chrome/browser/resources/options/options.js |
+++ b/chrome/browser/resources/options/options.js |
@@ -103,7 +103,10 @@ function load() { |
templateData.languagePinyinPageTabTitle, |
'languagePinyinPage'), |
LanguageOptions.getInstance()); |
- if (cr.isTouch) { |
+ // 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()); |
} |