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

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

Issue 9668010: Move proxy handling into network details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix 80-column wrap. 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;
11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
12 var ContentSettings = options.ContentSettings; 12 var ContentSettings = options.ContentSettings;
13 var ContentSettingsExceptionsArea = 13 var ContentSettingsExceptionsArea =
14 options.contentSettings.ContentSettingsExceptionsArea; 14 options.contentSettings.ContentSettingsExceptionsArea;
15 var CookiesView = options.CookiesView; 15 var CookiesView = options.CookiesView;
16 var FontSettings = options.FontSettings; 16 var FontSettings = options.FontSettings;
17 var HandlerOptions = options.HandlerOptions; 17 var HandlerOptions = options.HandlerOptions;
18 var HomePageOverlay = options.HomePageOverlay; 18 var HomePageOverlay = options.HomePageOverlay;
19 var ImportDataOverlay = options.ImportDataOverlay; 19 var ImportDataOverlay = options.ImportDataOverlay;
20 var InstantConfirmOverlay = options.InstantConfirmOverlay; 20 var InstantConfirmOverlay = options.InstantConfirmOverlay;
21 var LanguageOptions = options.LanguageOptions; 21 var LanguageOptions = options.LanguageOptions;
22 var OptionsPage = options.OptionsPage; 22 var OptionsPage = options.OptionsPage;
23 var PasswordManager = options.PasswordManager; 23 var PasswordManager = options.PasswordManager;
24 var Preferences = options.Preferences; 24 var Preferences = options.Preferences;
25 var PreferredNetworks = options.PreferredNetworks; 25 var PreferredNetworks = options.PreferredNetworks;
26 var ManageProfileOverlay = options.ManageProfileOverlay; 26 var ManageProfileOverlay = options.ManageProfileOverlay;
27 var ProxyOptions = options.ProxyOptions;
28 var SearchEngineManager = options.SearchEngineManager; 27 var SearchEngineManager = options.SearchEngineManager;
29 var SearchPage = options.SearchPage; 28 var SearchPage = options.SearchPage;
30 var SessionRestoreOverlay = options.SessionRestoreOverlay; 29 var SessionRestoreOverlay = options.SessionRestoreOverlay;
31 var StartupOverlay = options.StartupOverlay; 30 var StartupOverlay = options.StartupOverlay;
32 var SyncSetupOverlay = options.SyncSetupOverlay; 31 var SyncSetupOverlay = options.SyncSetupOverlay;
33 var VirtualKeyboardManager = options.VirtualKeyboardManager; 32 var VirtualKeyboardManager = options.VirtualKeyboardManager;
34 33
35 /** 34 /**
36 * DOMContentLoaded handler, sets up the page. 35 * DOMContentLoaded handler, sets up the page.
37 */ 36 */
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 OptionsPage.registerOverlay(InternetOptions.getInstance(), 129 OptionsPage.registerOverlay(InternetOptions.getInstance(),
131 BrowserOptions.getInstance()); 130 BrowserOptions.getInstance());
132 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(), 131 OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
133 BrowserOptions.getInstance(), 132 BrowserOptions.getInstance(),
134 [$('keyboard-settings-button')]); 133 [$('keyboard-settings-button')]);
135 OptionsPage.registerOverlay(PointerOverlay.getInstance(), 134 OptionsPage.registerOverlay(PointerOverlay.getInstance(),
136 BrowserOptions.getInstance(), 135 BrowserOptions.getInstance(),
137 [$('pointer-settings-button')]); 136 [$('pointer-settings-button')]);
138 OptionsPage.registerOverlay(PreferredNetworks.getInstance(), 137 OptionsPage.registerOverlay(PreferredNetworks.getInstance(),
139 BrowserOptions.getInstance()); 138 BrowserOptions.getInstance());
140 OptionsPage.registerOverlay(ProxyOptions.getInstance(),
141 DetailsInternetPage.getInstance());
142 OptionsPage.registerOverlay( 139 OptionsPage.registerOverlay(
143 new OptionsPage('languageChewing', 140 new OptionsPage('languageChewing',
144 templateData.languageChewingPageTabTitle, 141 templateData.languageChewingPageTabTitle,
145 'languageChewingPage'), 142 'languageChewingPage'),
146 LanguageOptions.getInstance()); 143 LanguageOptions.getInstance());
147 OptionsPage.registerOverlay( 144 OptionsPage.registerOverlay(
148 new OptionsPage('languageHangul', 145 new OptionsPage('languageHangul',
149 templateData.languageHangulPageTabTitle, 146 templateData.languageHangulPageTabTitle,
150 'languageHangulPage'), 147 'languageHangulPage'),
151 LanguageOptions.getInstance()); 148 LanguageOptions.getInstance());
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 options.OptionsPage.willClose(); 223 options.OptionsPage.willClose();
227 }; 224 };
228 225
229 /** 226 /**
230 * Listener for the |popstate| event. 227 * Listener for the |popstate| event.
231 * @param {Event} e The |popstate| event. 228 * @param {Event} e The |popstate| event.
232 */ 229 */
233 window.onpopstate = function(e) { 230 window.onpopstate = function(e) {
234 options.OptionsPage.setState(e.state); 231 options.OptionsPage.setState(e.state);
235 }; 232 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698