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

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

Issue 9181013: [uber page] Migrate remaining Personal options into Browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: kill, kill, kill! Created 8 years, 11 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 AdvancedOptions = options.AdvancedOptions; 6 var AdvancedOptions = options.AdvancedOptions;
7 var AlertOverlay = options.AlertOverlay; 7 var AlertOverlay = options.AlertOverlay;
8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; 8 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; 9 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
10 var AutofillOptions = options.AutofillOptions; 10 var AutofillOptions = options.AutofillOptions;
11 var BrowserOptions = options.BrowserOptions; 11 var BrowserOptions = options.BrowserOptions;
12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
13 var ContentSettings = options.ContentSettings; 13 var ContentSettings = options.ContentSettings;
14 var ContentSettingsExceptionsArea = 14 var ContentSettingsExceptionsArea =
15 options.contentSettings.ContentSettingsExceptionsArea; 15 options.contentSettings.ContentSettingsExceptionsArea;
16 var CookiesView = options.CookiesView; 16 var CookiesView = options.CookiesView;
17 var FontSettings = options.FontSettings; 17 var FontSettings = options.FontSettings;
18 var HandlerOptions = options.HandlerOptions; 18 var HandlerOptions = options.HandlerOptions;
19 var HomePageOverlay = options.HomePageOverlay; 19 var HomePageOverlay = options.HomePageOverlay;
20 var ImportDataOverlay = options.ImportDataOverlay; 20 var ImportDataOverlay = options.ImportDataOverlay;
21 var IntentsView = options.IntentsView; 21 var IntentsView = options.IntentsView;
22 var InstantConfirmOverlay = options.InstantConfirmOverlay; 22 var InstantConfirmOverlay = options.InstantConfirmOverlay;
23 var LanguageOptions = options.LanguageOptions; 23 var LanguageOptions = options.LanguageOptions;
24 var OptionsPage = options.OptionsPage; 24 var OptionsPage = options.OptionsPage;
25 var PasswordManager = options.PasswordManager; 25 var PasswordManager = options.PasswordManager;
26 var PersonalOptions = options.PersonalOptions;
27 var Preferences = options.Preferences; 26 var Preferences = options.Preferences;
28 var ManageProfileOverlay = options.ManageProfileOverlay; 27 var ManageProfileOverlay = options.ManageProfileOverlay;
29 var ProxyOptions = options.ProxyOptions; 28 var ProxyOptions = options.ProxyOptions;
30 var SearchEngineManager = options.SearchEngineManager; 29 var SearchEngineManager = options.SearchEngineManager;
31 var SearchPage = options.SearchPage; 30 var SearchPage = options.SearchPage;
32 var StartupOverlay = options.StartupOverlay; 31 var StartupOverlay = options.StartupOverlay;
33 var SyncSetupOverlay = options.SyncSetupOverlay; 32 var SyncSetupOverlay = options.SyncSetupOverlay;
34 var VirtualKeyboardManager = options.VirtualKeyboardManager; 33 var VirtualKeyboardManager = options.VirtualKeyboardManager;
35 34
36 /** 35 /**
(...skipping 28 matching lines...) Expand all
65 64
66 OptionsPage.register(SearchPage.getInstance()); 65 OptionsPage.register(SearchPage.getInstance());
67 66
68 OptionsPage.register(BrowserOptions.getInstance()); 67 OptionsPage.register(BrowserOptions.getInstance());
69 OptionsPage.registerSubPage(SearchEngineManager.getInstance(), 68 OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
70 BrowserOptions.getInstance(), 69 BrowserOptions.getInstance(),
71 [$('defaultSearchManageEnginesButton')]); 70 [$('defaultSearchManageEnginesButton')]);
72 OptionsPage.registerSubPage(AdvancedOptions.getInstance(), 71 OptionsPage.registerSubPage(AdvancedOptions.getInstance(),
73 BrowserOptions.getInstance(), 72 BrowserOptions.getInstance(),
74 [$('advancedOptionsButton')]); 73 [$('advancedOptionsButton')]);
75 OptionsPage.register(PersonalOptions.getInstance());
76 if (cr.isChromeOS) { 74 if (cr.isChromeOS) {
77 OptionsPage.register(SystemOptions.getInstance()); 75 OptionsPage.register(SystemOptions.getInstance());
78 OptionsPage.registerSubPage(AboutPage.getInstance(), 76 OptionsPage.registerSubPage(AboutPage.getInstance(),
79 SystemOptions.getInstance()); 77 SystemOptions.getInstance());
80 OptionsPage.registerSubPage(LanguageOptions.getInstance(), 78 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
81 SystemOptions.getInstance(), 79 SystemOptions.getInstance(),
82 [$('language-button')]); 80 [$('language-button')]);
83 OptionsPage.registerSubPage( 81 OptionsPage.registerSubPage(
84 new OptionsPage('languageChewing', 82 new OptionsPage('languageChewing',
85 templateData.languageChewingPageTabTitle, 83 templateData.languageChewingPageTabTitle,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 AutofillOptions.getInstance()); 161 AutofillOptions.getInstance());
164 OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(), 162 OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(),
165 AutofillOptions.getInstance()); 163 AutofillOptions.getInstance());
166 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(), 164 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(),
167 AdvancedOptions.getInstance(), 165 AdvancedOptions.getInstance(),
168 [$('privacyClearDataButton')]); 166 [$('privacyClearDataButton')]);
169 OptionsPage.registerOverlay(HomePageOverlay.getInstance(), 167 OptionsPage.registerOverlay(HomePageOverlay.getInstance(),
170 BrowserOptions.getInstance(), 168 BrowserOptions.getInstance(),
171 [$('toolbarShowHomeButton')]); 169 [$('toolbarShowHomeButton')]);
172 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(), 170 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),
173 PersonalOptions.getInstance()); 171 BrowserOptions.getInstance());
174 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(), 172 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(),
175 BrowserOptions.getInstance()); 173 BrowserOptions.getInstance());
176 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(), 174 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
177 BrowserOptions.getInstance()); 175 BrowserOptions.getInstance());
178 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(), 176 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
179 BrowserOptions.getInstance()); 177 BrowserOptions.getInstance());
180 OptionsPage.registerOverlay(StartupOverlay.getInstance(), 178 OptionsPage.registerOverlay(StartupOverlay.getInstance(),
181 BrowserOptions.getInstance()); 179 BrowserOptions.getInstance());
182 180
183 if (cr.isChromeOS) { 181 if (cr.isChromeOS) {
184 OptionsPage.register(AccountsOptions.getInstance()); 182 OptionsPage.register(AccountsOptions.getInstance());
185 OptionsPage.registerSubPage(ProxyOptions.getInstance(), 183 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
186 InternetOptions.getInstance()); 184 InternetOptions.getInstance());
187 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(), 185 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),
188 PersonalOptions.getInstance(), 186 BrowserOptions.getInstance(),
189 [$('change-picture-button')]); 187 [$('change-picture-button')]);
190 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(), 188 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
191 InternetOptions.getInstance()); 189 InternetOptions.getInstance());
192 190
193 var languageModifierKeysOverlay = new OptionsPage( 191 var languageModifierKeysOverlay = new OptionsPage(
194 'languageCustomizeModifierKeysOverlay', 192 'languageCustomizeModifierKeysOverlay',
195 localStrings.getString('languageCustomizeModifierKeysOverlay'), 193 localStrings.getString('languageCustomizeModifierKeysOverlay'),
196 'languageCustomizeModifierKeysOverlay') 194 'languageCustomizeModifierKeysOverlay')
197 $('languageCustomizeModifierKeysOverleyDismissButton').onclick = 195 $('languageCustomizeModifierKeysOverleyDismissButton').onclick =
198 function() { 196 function() {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 239
242 document.addEventListener('DOMContentLoaded', load); 240 document.addEventListener('DOMContentLoaded', load);
243 241
244 window.onpopstate = function(e) { 242 window.onpopstate = function(e) {
245 options.OptionsPage.setState(e.state); 243 options.OptionsPage.setState(e.state);
246 }; 244 };
247 245
248 window.onbeforeunload = function() { 246 window.onbeforeunload = function() {
249 options.OptionsPage.willClose(); 247 options.OptionsPage.willClose();
250 }; 248 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698