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

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

Issue 7108034: Fix certificate manager registerSubPage using wrong button name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 AdvancedOptions = options.AdvancedOptions; 6 var AdvancedOptions = options.AdvancedOptions;
7 var AlertOverlay = options.AlertOverlay; 7 var AlertOverlay = options.AlertOverlay;
8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
10 var AutofillOptions = options.AutofillOptions; 10 var AutofillOptions = options.AutofillOptions;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 AdvancedOptions.getInstance(), 117 AdvancedOptions.getInstance(),
118 [$('fontSettingsCustomizeFontsButton')]); 118 [$('fontSettingsCustomizeFontsButton')]);
119 if (!cr.isChromeOS) { 119 if (!cr.isChromeOS) {
120 OptionsPage.registerSubPage(LanguageOptions.getInstance(), 120 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
121 AdvancedOptions.getInstance(), 121 AdvancedOptions.getInstance(),
122 [$('language-button')]); 122 [$('language-button')]);
123 } 123 }
124 if (!cr.isWindows && !cr.isMac) { 124 if (!cr.isWindows && !cr.isMac) {
125 OptionsPage.registerSubPage(CertificateManager.getInstance(), 125 OptionsPage.registerSubPage(CertificateManager.getInstance(),
126 AdvancedOptions.getInstance(), 126 AdvancedOptions.getInstance(),
127 [$('show-cookies-button')]); 127 [$('certificatesManageButton')]);
128 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance(), 128 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance(),
129 CertificateManager.getInstance()); 129 CertificateManager.getInstance());
130 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), 130 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
131 CertificateManager.getInstance()); 131 CertificateManager.getInstance());
132 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 132 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
133 CertificateManager.getInstance()); 133 CertificateManager.getInstance());
134 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), 134 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
135 CertificateManager.getInstance()); 135 CertificateManager.getInstance());
136 } 136 }
137 OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(), 137 OptionsPage.registerOverlay(AddLanguageOverlay.getInstance(),
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 document.addEventListener('DOMContentLoaded', load); 221 document.addEventListener('DOMContentLoaded', load);
222 222
223 window.onpopstate = function(e) { 223 window.onpopstate = function(e) {
224 options.OptionsPage.setState(e.state); 224 options.OptionsPage.setState(e.state);
225 }; 225 };
226 226
227 window.onbeforeunload = function() { 227 window.onbeforeunload = function() {
228 options.OptionsPage.willClose(); 228 options.OptionsPage.willClose();
229 }; 229 };
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698