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

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: Save user choosed index to local state 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'languagePinyinPage'), 166 'languagePinyinPage'),
167 LanguageOptions.getInstance()); 167 LanguageOptions.getInstance());
168 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which 168 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
169 // it will assume exists) are present (i.e. if we were built with 169 // it will assume exists) are present (i.e. if we were built with
170 // use_virtual_keyboard=1). 170 // use_virtual_keyboard=1).
171 if ($('language-options-virtual-keyboard')) { 171 if ($('language-options-virtual-keyboard')) {
172 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), 172 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
173 LanguageOptions.getInstance()); 173 LanguageOptions.getInstance());
174 } 174 }
175 } 175 }
176
177 if (SetWallpaperOptions) {
178 OptionsPage.registerOverlay(SetWallpaperOptions.getInstance(),
179 BrowserOptions.getInstance(),
180 [$('set-wallpaper')]);
181 }
182
176 if (!cr.isWindows && !cr.isMac) { 183 if (!cr.isWindows && !cr.isMac) {
177 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), 184 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
178 CertificateManager.getInstance()); 185 CertificateManager.getInstance());
179 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 186 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
180 CertificateManager.getInstance()); 187 CertificateManager.getInstance());
181 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), 188 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
182 CertificateManager.getInstance()); 189 CertificateManager.getInstance());
183 OptionsPage.registerOverlay(CertificateManager.getInstance(), 190 OptionsPage.registerOverlay(CertificateManager.getInstance(),
184 BrowserOptions.getInstance(), 191 BrowserOptions.getInstance(),
185 [$('certificatesManageButton')]); 192 [$('certificatesManageButton')]);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 options.OptionsPage.willClose(); 239 options.OptionsPage.willClose();
233 }; 240 };
234 241
235 /** 242 /**
236 * Listener for the |popstate| event. 243 * Listener for the |popstate| event.
237 * @param {Event} e The |popstate| event. 244 * @param {Event} e The |popstate| event.
238 */ 245 */
239 window.onpopstate = function(e) { 246 window.onpopstate = function(e) {
240 options.OptionsPage.setState(e.state); 247 options.OptionsPage.setState(e.state);
241 }; 248 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698