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

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

Issue 5790001: Remove parent window (dangling in background) for chrome://settings when invoked at OOBE screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance()); 111 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());
112 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance()); 112 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance());
113 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 113 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
114 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance()); 114 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance());
115 OptionsPage.registerOverlay(ImportDataOverlay.getInstance()); 115 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());
116 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance()); 116 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance());
117 117
118 if (cr.isChromeOS) { 118 if (cr.isChromeOS) {
119 OptionsPage.register(AccountsOptions.getInstance()); 119 OptionsPage.register(AccountsOptions.getInstance());
120 OptionsPage.registerSubPage(ProxyOptions.getInstance(), 120 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
121 InternetOptions.getInstance()); 121 AdvancedOptions.getInstance());
122 OptionsPage.registerOverlay(new OptionsPage( 122 OptionsPage.registerOverlay(new OptionsPage(
123 'detailsInternetPage', 123 'detailsInternetPage',
124 'detailsInternetPage', 124 'detailsInternetPage',
125 'detailsInternetPage')); 125 'detailsInternetPage'));
126 } 126 }
127 127
128 var languageModifierKeysOverlay = new OptionsPage( 128 var languageModifierKeysOverlay = new OptionsPage(
129 'languageCustomizeModifierKeysOverlay', 129 'languageCustomizeModifierKeysOverlay',
130 localStrings.getString('languageCustomizeModifierKeysOverlay'), 130 localStrings.getString('languageCustomizeModifierKeysOverlay'),
131 'languageCustomizeModifierKeysOverlay') 131 'languageCustomizeModifierKeysOverlay')
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 $('subpage-close').onclick = function() { 163 $('subpage-close').onclick = function() {
164 OptionsPage.closeSubPage(); 164 OptionsPage.closeSubPage();
165 }; 165 };
166 } 166 }
167 167
168 document.addEventListener('DOMContentLoaded', load); 168 document.addEventListener('DOMContentLoaded', load);
169 169
170 window.onpopstate = function(e) { 170 window.onpopstate = function(e) {
171 options.OptionsPage.setState(e.state); 171 options.OptionsPage.setState(e.state);
172 }; 172 };
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/proxy_settings_dialog.cc ('k') | chrome/browser/resources/options/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698