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

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: Fix a debug build error associated with color mode switch 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'languagePinyinPage'), 160 'languagePinyinPage'),
161 LanguageOptions.getInstance()); 161 LanguageOptions.getInstance());
162 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which 162 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
163 // it will assume exists) are present (i.e. if we were built with 163 // it will assume exists) are present (i.e. if we were built with
164 // use_virtual_keyboard=1). 164 // use_virtual_keyboard=1).
165 if ($('language-options-virtual-keyboard')) { 165 if ($('language-options-virtual-keyboard')) {
166 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), 166 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
167 LanguageOptions.getInstance()); 167 LanguageOptions.getInstance());
168 } 168 }
169 } 169 }
170
171 if (SetWallpaperOptions) {
172 OptionsPage.registerOverlay(SetWallpaperOptions.getInstance(),
173 BrowserOptions.getInstance(),
174 [$('set-wallpaper')]);
175 }
176
170 if (!cr.isWindows && !cr.isMac) { 177 if (!cr.isWindows && !cr.isMac) {
171 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), 178 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
172 CertificateManager.getInstance()); 179 CertificateManager.getInstance());
173 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), 180 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
174 CertificateManager.getInstance()); 181 CertificateManager.getInstance());
175 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), 182 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
176 CertificateManager.getInstance()); 183 CertificateManager.getInstance());
177 OptionsPage.registerOverlay(CertificateManager.getInstance(), 184 OptionsPage.registerOverlay(CertificateManager.getInstance(),
178 BrowserOptions.getInstance(), 185 BrowserOptions.getInstance(),
179 [$('certificatesManageButton')]); 186 [$('certificatesManageButton')]);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 options.OptionsPage.willClose(); 233 options.OptionsPage.willClose();
227 }; 234 };
228 235
229 /** 236 /**
230 * Listener for the |popstate| event. 237 * Listener for the |popstate| event.
231 * @param {Event} e The |popstate| event. 238 * @param {Event} e The |popstate| event.
232 */ 239 */
233 window.onpopstate = function(e) { 240 window.onpopstate = function(e) {
234 options.OptionsPage.setState(e.state); 241 options.OptionsPage.setState(e.state);
235 }; 242 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698