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

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

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 PageManager.registerOverlay(KeyboardOverlay.getInstance(), 202 PageManager.registerOverlay(KeyboardOverlay.getInstance(),
203 BrowserOptions.getInstance(), 203 BrowserOptions.getInstance(),
204 [$('keyboard-settings-button')]); 204 [$('keyboard-settings-button')]);
205 PageManager.registerOverlay(PointerOverlay.getInstance(), 205 PageManager.registerOverlay(PointerOverlay.getInstance(),
206 BrowserOptions.getInstance(), 206 BrowserOptions.getInstance(),
207 [$('pointer-settings-button')]); 207 [$('pointer-settings-button')]);
208 PageManager.registerOverlay(PreferredNetworks.getInstance(), 208 PageManager.registerOverlay(PreferredNetworks.getInstance(),
209 BrowserOptions.getInstance()); 209 BrowserOptions.getInstance());
210 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(), 210 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
211 LanguageOptions.getInstance()); 211 LanguageOptions.getInstance());
212 if (loadTimeData.getBoolean('showVersion')) {
213 PageManager.registerOverlay(help.ChannelChangePage.getInstance(),
214 help.HelpPage.getInstance());
215 PageManager.registerOverlay(help.HelpPage.getInstance(),
216 BrowserOptions.getInstance());
217 }
212 } 218 }
213 219
214 if (!cr.isWindows && !cr.isMac) { 220 if (!cr.isWindows && !cr.isMac) {
215 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(), 221 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(),
216 CertificateManager.getInstance()); 222 CertificateManager.getInstance());
217 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 223 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
218 CertificateManager.getInstance()); 224 CertificateManager.getInstance());
219 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(), 225 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(),
220 CertificateManager.getInstance()); 226 CertificateManager.getInstance());
221 PageManager.registerOverlay(CertificateManager.getInstance(), 227 PageManager.registerOverlay(CertificateManager.getInstance(),
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 }; 271 };
266 272
267 /** 273 /**
268 * Listener for the |popstate| event. 274 * Listener for the |popstate| event.
269 * @param {Event} e The |popstate| event. 275 * @param {Event} e The |popstate| event.
270 */ 276 */
271 window.onpopstate = function(e) { 277 window.onpopstate = function(e) {
272 var pageName = PageManager.getPageNameFromPath(); 278 var pageName = PageManager.getPageNameFromPath();
273 PageManager.setState(pageName, e.state); 279 PageManager.setState(pageName, e.state);
274 }; 280 };
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