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

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

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and remove temp flag Created 7 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
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(), 173 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
174 BrowserOptions.getInstance()); 174 BrowserOptions.getInstance());
175 OptionsPage.registerOverlay(DisplayOptions.getInstance(), 175 OptionsPage.registerOverlay(DisplayOptions.getInstance(),
176 BrowserOptions.getInstance(), 176 BrowserOptions.getInstance(),
177 [$('display-options')]); 177 [$('display-options')]);
178 OptionsPage.registerOverlay(DisplayOverscan.getInstance(), 178 OptionsPage.registerOverlay(DisplayOverscan.getInstance(),
179 DisplayOptions.getInstance()); 179 DisplayOptions.getInstance());
180 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(), 180 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
181 BrowserOptions.getInstance(), 181 BrowserOptions.getInstance(),
182 [$('keyboard-settings-button')]); 182 [$('keyboard-settings-button')]);
183 OptionsPage.registerOverlay(KioskAppsOverlay.getInstance(),
184 BrowserOptions.getInstance(),
185 [$('manage-kiosk-apps-button')]);
186 OptionsPage.registerOverlay(KioskDisableBailoutConfirm.getInstance(),
187 KioskAppsOverlay.getInstance());
188 OptionsPage.registerOverlay(PointerOverlay.getInstance(), 183 OptionsPage.registerOverlay(PointerOverlay.getInstance(),
189 BrowserOptions.getInstance(), 184 BrowserOptions.getInstance(),
190 [$('pointer-settings-button')]); 185 [$('pointer-settings-button')]);
191 OptionsPage.registerOverlay(PreferredNetworks.getInstance(), 186 OptionsPage.registerOverlay(PreferredNetworks.getInstance(),
192 BrowserOptions.getInstance()); 187 BrowserOptions.getInstance());
193 OptionsPage.registerOverlay( 188 OptionsPage.registerOverlay(
194 new OptionsPage('languageChewing', 189 new OptionsPage('languageChewing',
195 loadTimeData.getString('languageChewingPageTabTitle'), 190 loadTimeData.getString('languageChewingPageTabTitle'),
196 'languageChewingPage'), 191 'languageChewingPage'),
197 LanguageOptions.getInstance()); 192 LanguageOptions.getInstance());
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 options.OptionsPage.willClose(); 260 options.OptionsPage.willClose();
266 }; 261 };
267 262
268 /** 263 /**
269 * Listener for the |popstate| event. 264 * Listener for the |popstate| event.
270 * @param {Event} e The |popstate| event. 265 * @param {Event} e The |popstate| event.
271 */ 266 */
272 window.onpopstate = function(e) { 267 window.onpopstate = function(e) {
273 options.OptionsPage.setState(e.state); 268 options.OptionsPage.setState(e.state);
274 }; 269 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698