OLD | NEW |
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 cr.define('options', function() { | 5 cr.define('options', function() { |
6 var OptionsPage = options.OptionsPage; | 6 var OptionsPage = options.OptionsPage; |
7 var ArrayDataModel = cr.ui.ArrayDataModel; | 7 var ArrayDataModel = cr.ui.ArrayDataModel; |
8 var RepeatingButton = cr.ui.RepeatingButton; | 8 var RepeatingButton = cr.ui.RepeatingButton; |
9 | 9 |
10 // | 10 // |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 | 163 |
164 // Search section. | 164 // Search section. |
165 $('manage-default-search-engines').onclick = function(event) { | 165 $('manage-default-search-engines').onclick = function(event) { |
166 OptionsPage.navigateToPage('searchEngines'); | 166 OptionsPage.navigateToPage('searchEngines'); |
167 chrome.send('coreOptionsUserMetricsAction', | 167 chrome.send('coreOptionsUserMetricsAction', |
168 ['Options_ManageSearchEngines']); | 168 ['Options_ManageSearchEngines']); |
169 }; | 169 }; |
170 $('default-search-engine').addEventListener('change', | 170 $('default-search-engine').addEventListener('change', |
171 this.setDefaultSearchEngine_); | 171 this.setDefaultSearchEngine_); |
172 $('instant-enabled-control').customChangeHandler = function(event) { | 172 $('instant-enabled-control').customChangeHandler = function(event) { |
173 if (this.checked) { | 173 if (this.checked && !self.instantConfirmDialogShown_) { |
174 if (self.instantConfirmDialogShown_) | 174 OptionsPage.showPageByName('instantConfirm', false); |
175 chrome.send('enableInstant'); | 175 return true; // Stop default preference processing. |
176 else | |
177 OptionsPage.showPageByName('instantConfirm', false); | |
178 } else { | |
179 chrome.send('disableInstant'); | |
180 } | 176 } |
181 return true; | 177 return false; // Allow default preference processing. |
182 }; | 178 }; |
183 Preferences.getInstance().addEventListener('instant.confirm_dialog_shown', | 179 Preferences.getInstance().addEventListener('instant.confirm_dialog_shown', |
184 this.onInstantConfirmDialogShownChanged_.bind(this)); | 180 this.onInstantConfirmDialogShownChanged_.bind(this)); |
185 | 181 |
186 // Users section. | 182 // Users section. |
187 if (loadTimeData.valueExists('profilesInfo')) { | 183 if (loadTimeData.valueExists('profilesInfo')) { |
188 $('profiles-section').hidden = false; | 184 $('profiles-section').hidden = false; |
189 | 185 |
190 var profilesList = $('profiles-list'); | 186 var profilesList = $('profiles-list'); |
191 options.browser_options.ProfileList.decorate(profilesList); | 187 options.browser_options.ProfileList.decorate(profilesList); |
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1345 BrowserOptions.getLoggedInUsername = function() { | 1341 BrowserOptions.getLoggedInUsername = function() { |
1346 return BrowserOptions.getInstance().username_; | 1342 return BrowserOptions.getInstance().username_; |
1347 }; | 1343 }; |
1348 } | 1344 } |
1349 | 1345 |
1350 // Export | 1346 // Export |
1351 return { | 1347 return { |
1352 BrowserOptions: BrowserOptions | 1348 BrowserOptions: BrowserOptions |
1353 }; | 1349 }; |
1354 }); | 1350 }); |
OLD | NEW |