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

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

Issue 6151004: DOMUI Prefs: Replace search engine edit overlay with inline editing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address last comment Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 AddStartupPageOverlay = options.AddStartupPageOverlay; 5 var AddStartupPageOverlay = options.AddStartupPageOverlay;
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 ClearBrowserDataPage = options.ClearBrowserDataPage; 12 var ClearBrowserDataPage = options.ClearBrowserDataPage;
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 EditSearchEngineOverlay = options.EditSearchEngineOverlay;
18 var FontSettings = options.FontSettings; 17 var FontSettings = options.FontSettings;
19 var ImportDataOverlay = options.ImportDataOverlay; 18 var ImportDataOverlay = options.ImportDataOverlay;
20 var InstantConfirmOverlay = options.InstantConfirmOverlay; 19 var InstantConfirmOverlay = options.InstantConfirmOverlay;
21 var OptionsPage = options.OptionsPage; 20 var OptionsPage = options.OptionsPage;
22 var PasswordManager = options.PasswordManager; 21 var PasswordManager = options.PasswordManager;
23 var PersonalOptions = options.PersonalOptions; 22 var PersonalOptions = options.PersonalOptions;
24 var Preferences = options.Preferences; 23 var Preferences = options.Preferences;
25 var ProxyOptions = options.ProxyOptions; 24 var ProxyOptions = options.ProxyOptions;
26 var SearchEngineManager = options.SearchEngineManager; 25 var SearchEngineManager = options.SearchEngineManager;
27 var SearchPage = options.SearchPage; 26 var SearchPage = options.SearchPage;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 [$('show-cookies-button')]); 116 [$('show-cookies-button')]);
118 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance()); 117 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance());
119 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance()); 118 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance());
120 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance()); 119 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance());
121 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance()); 120 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance());
122 } 121 }
123 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); 122 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());
124 OptionsPage.registerOverlay(AlertOverlay.getInstance()); 123 OptionsPage.registerOverlay(AlertOverlay.getInstance());
125 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance()); 124 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());
126 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance()); 125 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance());
127 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance());
128 OptionsPage.registerOverlay(ImportDataOverlay.getInstance()); 126 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());
129 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance()); 127 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance());
130 128
131 if (cr.isChromeOS) { 129 if (cr.isChromeOS) {
132 OptionsPage.register(AccountsOptions.getInstance()); 130 OptionsPage.register(AccountsOptions.getInstance());
133 OptionsPage.registerSubPage(ProxyOptions.getInstance(), 131 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
134 AdvancedOptions.getInstance(), 132 AdvancedOptions.getInstance(),
135 [$('proxiesConfigureButton')]); 133 [$('proxiesConfigureButton')]);
136 OptionsPage.registerOverlay(new OptionsPage('detailsInternetPage', 134 OptionsPage.registerOverlay(new OptionsPage('detailsInternetPage',
137 'detailsInternetPage', 135 'detailsInternetPage',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 document.documentElement.setAttribute('toolkit', 'gtk'); 173 document.documentElement.setAttribute('toolkit', 'gtk');
176 if (cr.isViews) 174 if (cr.isViews)
177 document.documentElement.setAttribute('toolkit', 'views'); 175 document.documentElement.setAttribute('toolkit', 'views');
178 } 176 }
179 177
180 document.addEventListener('DOMContentLoaded', load); 178 document.addEventListener('DOMContentLoaded', load);
181 179
182 window.onpopstate = function(e) { 180 window.onpopstate = function(e) {
183 options.OptionsPage.setState(e.state); 181 options.OptionsPage.setState(e.state);
184 }; 182 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698