| Index: chrome/browser/resources/options/options.js
|
| diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
|
| index c7e29114725f9099d25d51dc90b2ae94f976d495..6ae41e2b1b42ed782be43cb63f7840d0e4e1c6a4 100644
|
| --- a/chrome/browser/resources/options/options.js
|
| +++ b/chrome/browser/resources/options/options.js
|
| @@ -95,20 +95,16 @@ function load() {
|
| $('do-not-track-enabled')['pref'],
|
| $('do-not-track-enabled')['metric']),
|
| BrowserOptions.getInstance());
|
| - // 'spelling-enabled-control' element is only present on Chrome branded
|
| - // builds.
|
| - if ($('spelling-enabled-control')) {
|
| - PageManager.registerOverlay(
|
| - new ConfirmDialog(
|
| - 'spellingConfirm',
|
| - loadTimeData.getString('spellingConfirmOverlayTabTitle'),
|
| - 'spelling-confirm-overlay',
|
| - /** @type {HTMLButtonElement} */($('spelling-confirm-ok')),
|
| - /** @type {HTMLButtonElement} */($('spelling-confirm-cancel')),
|
| - $('spelling-enabled-control')['pref'],
|
| - $('spelling-enabled-control')['metric']),
|
| - BrowserOptions.getInstance());
|
| - }
|
| + PageManager.registerOverlay(
|
| + new ConfirmDialog(
|
| + 'spellingConfirm',
|
| + loadTimeData.getString('spellingConfirmOverlayTabTitle'),
|
| + 'spelling-confirm-overlay',
|
| + /** @type {HTMLButtonElement} */($('spelling-confirm-ok')),
|
| + /** @type {HTMLButtonElement} */($('spelling-confirm-cancel')),
|
| + $('spelling-enabled-control')['pref'],
|
| + $('spelling-enabled-control')['metric']),
|
| + BrowserOptions.getInstance());
|
| PageManager.registerOverlay(new HotwordConfirmDialog(),
|
| BrowserOptions.getInstance());
|
| PageManager.registerOverlay(ContentSettings.getInstance(),
|
| @@ -242,6 +238,12 @@ function load() {
|
| PageManager.addObserver(new uber.PageManagerObserver());
|
| uber.onContentFrameLoaded();
|
|
|
| + // The spelling service should be unavailable when multilingual spellchecking
|
| + // is enabled so the option will not be shown.
|
| + if (loadTimeData.getBoolean('enableMultilingualSpellChecker')) {
|
| + $('spelling-enabled-container').hidden = true;
|
| + }
|
| +
|
| var pageName = PageManager.getPageNameFromPath();
|
| // Still update history so that chrome://settings/nonexistant redirects
|
| // appropriately to chrome://settings/. If the URL matches, updateHistory_
|
|
|