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

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

Issue 325633003: Add confirmation dialog when enabling a 3rd party IME. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 6 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 | Annotate | Revision Log
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 23 matching lines...) Expand all
34 var OptionsPage = options.OptionsPage; 34 var OptionsPage = options.OptionsPage;
35 var PasswordManager = options.PasswordManager; 35 var PasswordManager = options.PasswordManager;
36 var Preferences = options.Preferences; 36 var Preferences = options.Preferences;
37 var PreferredNetworks = options.PreferredNetworks; 37 var PreferredNetworks = options.PreferredNetworks;
38 var ResetProfileSettingsBanner = options.ResetProfileSettingsBanner; 38 var ResetProfileSettingsBanner = options.ResetProfileSettingsBanner;
39 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; 39 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;
40 var SearchEngineManager = options.SearchEngineManager; 40 var SearchEngineManager = options.SearchEngineManager;
41 var SearchPage = options.SearchPage; 41 var SearchPage = options.SearchPage;
42 var StartupOverlay = options.StartupOverlay; 42 var StartupOverlay = options.StartupOverlay;
43 var SyncSetupOverlay = options.SyncSetupOverlay; 43 var SyncSetupOverlay = options.SyncSetupOverlay;
44 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
44 45
45 /** 46 /**
46 * DOMContentLoaded handler, sets up the page. 47 * DOMContentLoaded handler, sets up the page.
47 */ 48 */
48 function load() { 49 function load() {
49 // Decorate the existing elements in the document. 50 // Decorate the existing elements in the document.
50 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox); 51 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox);
51 cr.ui.decorate('input[pref][type=number]', options.PrefNumber); 52 cr.ui.decorate('input[pref][type=number]', options.PrefNumber);
52 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio); 53 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);
53 cr.ui.decorate('input[pref][type=range]', options.PrefRange); 54 cr.ui.decorate('input[pref][type=range]', options.PrefRange);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 OptionsPage.registerOverlay(DisplayOverscan.getInstance(), 195 OptionsPage.registerOverlay(DisplayOverscan.getInstance(),
195 DisplayOptions.getInstance()); 196 DisplayOptions.getInstance());
196 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(), 197 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
197 BrowserOptions.getInstance(), 198 BrowserOptions.getInstance(),
198 [$('keyboard-settings-button')]); 199 [$('keyboard-settings-button')]);
199 OptionsPage.registerOverlay(PointerOverlay.getInstance(), 200 OptionsPage.registerOverlay(PointerOverlay.getInstance(),
200 BrowserOptions.getInstance(), 201 BrowserOptions.getInstance(),
201 [$('pointer-settings-button')]); 202 [$('pointer-settings-button')]);
202 OptionsPage.registerOverlay(PreferredNetworks.getInstance(), 203 OptionsPage.registerOverlay(PreferredNetworks.getInstance(),
203 BrowserOptions.getInstance()); 204 BrowserOptions.getInstance());
205 OptionsPage.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
206 LanguageOptions.getInstance());
204 } 207 }
205 208
206 if (!cr.isWindows && !cr.isMac) { 209 if (!cr.isWindows && !cr.isMac) {
207 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), 210 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
208 CertificateManager.getInstance()); 211 CertificateManager.getInstance());
209 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 212 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
210 CertificateManager.getInstance()); 213 CertificateManager.getInstance());
211 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), 214 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
212 CertificateManager.getInstance()); 215 CertificateManager.getInstance());
213 OptionsPage.registerOverlay(CertificateManager.getInstance(), 216 OptionsPage.registerOverlay(CertificateManager.getInstance(),
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 options.OptionsPage.willClose(); 260 options.OptionsPage.willClose();
258 }; 261 };
259 262
260 /** 263 /**
261 * Listener for the |popstate| event. 264 * Listener for the |popstate| event.
262 * @param {Event} e The |popstate| event. 265 * @param {Event} e The |popstate| event.
263 */ 266 */
264 window.onpopstate = function(e) { 267 window.onpopstate = function(e) {
265 options.OptionsPage.setState(e.state); 268 options.OptionsPage.setState(e.state);
266 }; 269 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698