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

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: How about another rebase! (damn you generated_resources.grd) 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(LanguageOptions.getInstance(), 76 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
79 SystemOptions.getInstance(), 77 SystemOptions.getInstance(),
80 [$('language-button')]); 78 [$('language-button')]);
81 OptionsPage.registerSubPage( 79 OptionsPage.registerSubPage(
82 new OptionsPage('languageChewing', 80 new OptionsPage('languageChewing',
83 templateData.languageChewingPageTabTitle, 81 templateData.languageChewingPageTabTitle,
84 'languageChewingPage'), 82 'languageChewingPage'),
85 LanguageOptions.getInstance()); 83 LanguageOptions.getInstance());
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 AutofillOptions.getInstance()); 159 AutofillOptions.getInstance());
162 OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(), 160 OptionsPage.registerOverlay(AutofillEditCreditCardOverlay.getInstance(),
163 AutofillOptions.getInstance()); 161 AutofillOptions.getInstance());
164 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(), 162 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(),
165 AdvancedOptions.getInstance(), 163 AdvancedOptions.getInstance(),
166 [$('privacyClearDataButton')]); 164 [$('privacyClearDataButton')]);
167 OptionsPage.registerOverlay(HomePageOverlay.getInstance(), 165 OptionsPage.registerOverlay(HomePageOverlay.getInstance(),
168 BrowserOptions.getInstance(), 166 BrowserOptions.getInstance(),
169 [$('toolbarShowHomeButton')]); 167 [$('toolbarShowHomeButton')]);
170 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(), 168 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),
171 PersonalOptions.getInstance()); 169 BrowserOptions.getInstance());
172 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(), 170 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(),
173 BrowserOptions.getInstance()); 171 BrowserOptions.getInstance());
174 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(), 172 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
175 BrowserOptions.getInstance()); 173 BrowserOptions.getInstance());
176 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(), 174 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
177 BrowserOptions.getInstance()); 175 BrowserOptions.getInstance());
178 OptionsPage.registerOverlay(StartupOverlay.getInstance(), 176 OptionsPage.registerOverlay(StartupOverlay.getInstance(),
179 BrowserOptions.getInstance()); 177 BrowserOptions.getInstance());
180 178
181 if (cr.isChromeOS) { 179 if (cr.isChromeOS) {
182 OptionsPage.register(AccountsOptions.getInstance()); 180 OptionsPage.register(AccountsOptions.getInstance());
183 OptionsPage.registerSubPage(ProxyOptions.getInstance(), 181 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
184 InternetOptions.getInstance()); 182 InternetOptions.getInstance());
185 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(), 183 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),
186 PersonalOptions.getInstance(), 184 BrowserOptions.getInstance(),
187 [$('change-picture-button')]); 185 [$('change-picture-button')]);
188 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(), 186 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
189 InternetOptions.getInstance()); 187 InternetOptions.getInstance());
190 188
191 var languageModifierKeysOverlay = new OptionsPage( 189 var languageModifierKeysOverlay = new OptionsPage(
192 'languageCustomizeModifierKeysOverlay', 190 'languageCustomizeModifierKeysOverlay',
193 localStrings.getString('languageCustomizeModifierKeysOverlay'), 191 localStrings.getString('languageCustomizeModifierKeysOverlay'),
194 'languageCustomizeModifierKeysOverlay') 192 'languageCustomizeModifierKeysOverlay')
195 $('languageCustomizeModifierKeysOverleyDismissButton').onclick = 193 $('languageCustomizeModifierKeysOverleyDismissButton').onclick =
196 function() { 194 function() {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 237
240 document.addEventListener('DOMContentLoaded', load); 238 document.addEventListener('DOMContentLoaded', load);
241 239
242 window.onpopstate = function(e) { 240 window.onpopstate = function(e) {
243 options.OptionsPage.setState(e.state); 241 options.OptionsPage.setState(e.state);
244 }; 242 };
245 243
246 window.onbeforeunload = function() { 244 window.onbeforeunload = function() {
247 options.OptionsPage.willClose(); 245 options.OptionsPage.willClose();
248 }; 246 };
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