Chromium Code Reviews| Index: chrome/browser/resources/options/language_options.js |
| diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js |
| index 06b2fec66aba3e146bdedc57de6d81f7a1b1a3ce..f70ac035377bb85e5efb901834c6dcc5aa7ec5d3 100644 |
| --- a/chrome/browser/resources/options/language_options.js |
| +++ b/chrome/browser/resources/options/language_options.js |
| @@ -77,30 +77,31 @@ cr.define('options', function() { |
| } |
| }; |
| - if (cr.isChromeOS) { |
| + if (cr.isChromeOS && !cr.isTouch) { |
| // Listen to user clicks on the add language list. |
| var addLanguageList = $('add-language-overlay-language-list'); |
| addLanguageList.addEventListener('click', |
| this.handleAddLanguageListClick_.bind(this)); |
| + } else { |
| + // Listen to add language dialog ok button. |
| + var addLanguageOkButton = $('add-language-overlay-ok-button'); |
| + addLanguageOkButton.addEventListener('click', |
| + this.handleAddLanguageOkButtonClick_.bind(this)); |
| + |
| // Listen to user clicks on the "Change touch keyboard settings..." |
| // button. |
| - if (cr.isTouch) { |
| + if (cr.isChromeOS && cr.isTouch) { |
| var virtualKeyboardButton = $('language-options-virtual-keyboard'); |
| // TODO(yusukes): would be better to hide the button if no virtual |
| // keyboard is registered. |
| virtualKeyboardButton.onclick = function(e) { |
| OptionsPage.navigateToPage('virtualKeyboards'); |
| }; |
| - } |
| - } else { |
| - // Listen to add language dialog ok button. |
| - var addLanguageOkButton = $('add-language-overlay-ok-button'); |
| - addLanguageOkButton.addEventListener('click', |
| - this.handleAddLanguageOkButtonClick_.bind(this)); |
| - |
| - // Show experimental features if enabled. |
| - if (templateData.experimentalSpellCheckFeatures == 'true') { |
| - $('auto-spell-correction-option').hidden = false; |
| + } else { |
| + // Show experimental features if enabled. |
| + if (templateData.experimentalSpellCheckFeatures == 'true') { |
|
James Hawkins
2011/10/31 04:36:20
nit: No braces for single-line blocks.
bshe
2011/10/31 14:18:21
Done.
|
| + $('auto-spell-correction-option').hidden = false; |
| + } |
| } |
| } |