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

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: About in Settings 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 PageManager.registerOverlay(KeyboardOverlay.getInstance(), 198 PageManager.registerOverlay(KeyboardOverlay.getInstance(),
199 BrowserOptions.getInstance(), 199 BrowserOptions.getInstance(),
200 [$('keyboard-settings-button')]); 200 [$('keyboard-settings-button')]);
201 PageManager.registerOverlay(PointerOverlay.getInstance(), 201 PageManager.registerOverlay(PointerOverlay.getInstance(),
202 BrowserOptions.getInstance(), 202 BrowserOptions.getInstance(),
203 [$('pointer-settings-button')]); 203 [$('pointer-settings-button')]);
204 PageManager.registerOverlay(PreferredNetworks.getInstance(), 204 PageManager.registerOverlay(PreferredNetworks.getInstance(),
205 BrowserOptions.getInstance()); 205 BrowserOptions.getInstance());
206 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(), 206 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
207 LanguageOptions.getInstance()); 207 LanguageOptions.getInstance());
208 if (loadTimeData.getBoolean('showVersion')) {
209 PageManager.registerOverlay(ChannelChangePage.getInstance(),
210 HelpPage.getInstance());
211 PageManager.registerOverlay(HelpPage.getInstance(),
212 BrowserOptions.getInstance());
213 }
208 } 214 }
209 215
210 if (!cr.isWindows && !cr.isMac) { 216 if (!cr.isWindows && !cr.isMac) {
211 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(), 217 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(),
212 CertificateManager.getInstance()); 218 CertificateManager.getInstance());
213 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 219 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
214 CertificateManager.getInstance()); 220 CertificateManager.getInstance());
215 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(), 221 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(),
216 CertificateManager.getInstance()); 222 CertificateManager.getInstance());
217 PageManager.registerOverlay(CertificateManager.getInstance(), 223 PageManager.registerOverlay(CertificateManager.getInstance(),
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 }; 268 };
263 269
264 /** 270 /**
265 * Listener for the |popstate| event. 271 * Listener for the |popstate| event.
266 * @param {Event} e The |popstate| event. 272 * @param {Event} e The |popstate| event.
267 */ 273 */
268 window.onpopstate = function(e) { 274 window.onpopstate = function(e) {
269 var pageName = PageManager.getPageNameFromPath(); 275 var pageName = PageManager.getPageNameFromPath();
270 PageManager.setState(pageName, e.state); 276 PageManager.setState(pageName, e.state);
271 }; 277 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698