Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: chrome/browser/resources/options/options.js

Issue 1156473007: Enables the user to select multiple languages for spellchecking (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted from using any #if defines to exclude Mac compiles. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var AddLanguageOverlay = options.AddLanguageOverlay; 5 var AddLanguageOverlay = options.AddLanguageOverlay;
6 var AlertOverlay = options.AlertOverlay; 6 var AlertOverlay = options.AlertOverlay;
7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
9 var AutofillOptions = options.AutofillOptions; 9 var AutofillOptions = options.AutofillOptions;
10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 PageManager.registerOverlay( 88 PageManager.registerOverlay(
89 new ConfirmDialog( 89 new ConfirmDialog(
90 'doNotTrackConfirm', 90 'doNotTrackConfirm',
91 loadTimeData.getString('doNotTrackConfirmOverlayTabTitle'), 91 loadTimeData.getString('doNotTrackConfirmOverlayTabTitle'),
92 'do-not-track-confirm-overlay', 92 'do-not-track-confirm-overlay',
93 /** @type {HTMLButtonElement} */($('do-not-track-confirm-ok')), 93 /** @type {HTMLButtonElement} */($('do-not-track-confirm-ok')),
94 /** @type {HTMLButtonElement} */($('do-not-track-confirm-cancel')), 94 /** @type {HTMLButtonElement} */($('do-not-track-confirm-cancel')),
95 $('do-not-track-enabled')['pref'], 95 $('do-not-track-enabled')['pref'],
96 $('do-not-track-enabled')['metric']), 96 $('do-not-track-enabled')['metric']),
97 BrowserOptions.getInstance()); 97 BrowserOptions.getInstance());
98 // 'spelling-enabled-control' element is only present on Chrome branded 98 PageManager.registerOverlay(
99 // builds. 99 new ConfirmDialog(
100 if ($('spelling-enabled-control')) { 100 'spellingConfirm',
101 PageManager.registerOverlay( 101 loadTimeData.getString('spellingConfirmOverlayTabTitle'),
102 new ConfirmDialog( 102 'spelling-confirm-overlay',
103 'spellingConfirm', 103 /** @type {HTMLButtonElement} */($('spelling-confirm-ok')),
104 loadTimeData.getString('spellingConfirmOverlayTabTitle'), 104 /** @type {HTMLButtonElement} */($('spelling-confirm-cancel')),
105 'spelling-confirm-overlay', 105 $('spelling-enabled-control')['pref'],
106 /** @type {HTMLButtonElement} */($('spelling-confirm-ok')), 106 $('spelling-enabled-control')['metric']),
107 /** @type {HTMLButtonElement} */($('spelling-confirm-cancel')), 107 BrowserOptions.getInstance());
108 $('spelling-enabled-control')['pref'],
109 $('spelling-enabled-control')['metric']),
110 BrowserOptions.getInstance());
111 }
112 PageManager.registerOverlay(new HotwordConfirmDialog(), 108 PageManager.registerOverlay(new HotwordConfirmDialog(),
113 BrowserOptions.getInstance()); 109 BrowserOptions.getInstance());
114 PageManager.registerOverlay(ContentSettings.getInstance(), 110 PageManager.registerOverlay(ContentSettings.getInstance(),
115 BrowserOptions.getInstance(), 111 BrowserOptions.getInstance(),
116 [$('privacyContentSettingsButton')]); 112 [$('privacyContentSettingsButton')]);
117 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(), 113 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
118 ContentSettings.getInstance()); 114 ContentSettings.getInstance());
119 PageManager.registerOverlay(CookiesView.getInstance(), 115 PageManager.registerOverlay(CookiesView.getInstance(),
120 ContentSettings.getInstance(), 116 ContentSettings.getInstance(),
121 [$('privacyContentSettingsButton'), 117 [$('privacyContentSettingsButton'),
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 231
236 OptionsFocusManager.getInstance().initialize(); 232 OptionsFocusManager.getInstance().initialize();
237 Preferences.getInstance().initialize(); 233 Preferences.getInstance().initialize();
238 ResetProfileSettingsBanner.getInstance().initialize(); 234 ResetProfileSettingsBanner.getInstance().initialize();
239 AutomaticSettingsResetBanner.getInstance().initialize(); 235 AutomaticSettingsResetBanner.getInstance().initialize();
240 OptionsPage.initialize(); 236 OptionsPage.initialize();
241 PageManager.initialize(BrowserOptions.getInstance()); 237 PageManager.initialize(BrowserOptions.getInstance());
242 PageManager.addObserver(new uber.PageManagerObserver()); 238 PageManager.addObserver(new uber.PageManagerObserver());
243 uber.onContentFrameLoaded(); 239 uber.onContentFrameLoaded();
244 240
241 // The spelling service should be unavailable when multilingual spellchecking
242 // is enabled so the option will not be shown.
243 if (loadTimeData.getBoolean('enableMultilingualSpellChecker')) {
244 $('spelling-enabled-container').hidden = true;
245 }
246
245 var pageName = PageManager.getPageNameFromPath(); 247 var pageName = PageManager.getPageNameFromPath();
246 // Still update history so that chrome://settings/nonexistant redirects 248 // Still update history so that chrome://settings/nonexistant redirects
247 // appropriately to chrome://settings/. If the URL matches, updateHistory_ 249 // appropriately to chrome://settings/. If the URL matches, updateHistory_
248 // will avoid the extra replaceState. 250 // will avoid the extra replaceState.
249 var updateHistory = true; 251 var updateHistory = true;
250 PageManager.showPageByName(pageName, updateHistory, 252 PageManager.showPageByName(pageName, updateHistory,
251 {replaceState: true, hash: location.hash}); 253 {replaceState: true, hash: location.hash});
252 254
253 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs'); 255 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs');
254 for (var i = 0; i < subpagesNavTabs.length; i++) { 256 for (var i = 0; i < subpagesNavTabs.length; i++) {
(...skipping 19 matching lines...) Expand all
274 }; 276 };
275 277
276 /** 278 /**
277 * Listener for the |popstate| event. 279 * Listener for the |popstate| event.
278 * @param {Event} e The |popstate| event. 280 * @param {Event} e The |popstate| event.
279 */ 281 */
280 window.onpopstate = function(e) { 282 window.onpopstate = function(e) {
281 var pageName = PageManager.getPageNameFromPath(); 283 var pageName = PageManager.getPageNameFromPath();
282 PageManager.setState(pageName, location.hash, e.state); 284 PageManager.setState(pageName, location.hash, e.state);
283 }; 285 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698