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

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

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Address review Created 8 years, 9 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 BrowserOptions = options.BrowserOptions; 10 var BrowserOptions = options.BrowserOptions;
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 'languagePinyinPage'), 158 'languagePinyinPage'),
159 LanguageOptions.getInstance()); 159 LanguageOptions.getInstance());
160 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which 160 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
161 // it will assume exists) are present (i.e. if we were built with 161 // it will assume exists) are present (i.e. if we were built with
162 // use_virtual_keyboard=1). 162 // use_virtual_keyboard=1).
163 if ($('language-options-virtual-keyboard')) { 163 if ($('language-options-virtual-keyboard')) {
164 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), 164 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
165 LanguageOptions.getInstance()); 165 LanguageOptions.getInstance());
166 } 166 }
167 } 167 }
168
169 if (SetWallpaperOptions) {
170 OptionsPage.registerOverlay(SetWallpaperOptions.getInstance(),
171 BrowserOptions.getInstance(),
172 [$('set-wallpaper')]);
173 }
174
168 if (!cr.isWindows && !cr.isMac) { 175 if (!cr.isWindows && !cr.isMac) {
169 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), 176 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
170 CertificateManager.getInstance()); 177 CertificateManager.getInstance());
171 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 178 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
172 CertificateManager.getInstance()); 179 CertificateManager.getInstance());
173 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), 180 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
174 CertificateManager.getInstance()); 181 CertificateManager.getInstance());
175 OptionsPage.registerOverlay(CertificateManager.getInstance(), 182 OptionsPage.registerOverlay(CertificateManager.getInstance(),
176 BrowserOptions.getInstance(), 183 BrowserOptions.getInstance(),
177 [$('certificatesManageButton')]); 184 [$('certificatesManageButton')]);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 options.OptionsPage.willClose(); 231 options.OptionsPage.willClose();
225 }; 232 };
226 233
227 /** 234 /**
228 * Listener for the |popstate| event. 235 * Listener for the |popstate| event.
229 * @param {Event} e The |popstate| event. 236 * @param {Event} e The |popstate| event.
230 */ 237 */
231 window.onpopstate = function(e) { 238 window.onpopstate = function(e) {
232 options.OptionsPage.setState(e.state); 239 options.OptionsPage.setState(e.state);
233 }; 240 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698