OLD | NEW |
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 cr.define('options', function() { | 5 cr.define('options', function() { |
6 const OptionsPage = options.OptionsPage; | 6 const OptionsPage = options.OptionsPage; |
7 const ArrayDataModel = cr.ui.ArrayDataModel; | 7 const ArrayDataModel = cr.ui.ArrayDataModel; |
8 | 8 |
9 // | 9 // |
10 // BrowserOptions class | 10 // BrowserOptions class |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 chrome.send('toggleShowBookmarksBar'); | 64 chrome.send('toggleShowBookmarksBar'); |
65 }; | 65 }; |
66 $('defaultSearchManageEnginesButton').onclick = function(event) { | 66 $('defaultSearchManageEnginesButton').onclick = function(event) { |
67 OptionsPage.navigateToPage('searchEngines'); | 67 OptionsPage.navigateToPage('searchEngines'); |
68 chrome.send('coreOptionsUserMetricsAction', | 68 chrome.send('coreOptionsUserMetricsAction', |
69 ['Options_ManageSearchEngines']); | 69 ['Options_ManageSearchEngines']); |
70 }; | 70 }; |
71 $('defaultSearchEngine').onchange = this.setDefaultSearchEngine_; | 71 $('defaultSearchEngine').onchange = this.setDefaultSearchEngine_; |
72 | 72 |
73 var self = this; | 73 var self = this; |
74 $('instantEnableCheckbox').onclick = function(event) { | 74 $('instantEnabledCheckbox').customChangeHandler = function(event) { |
75 if (this.checked && !self.instantConfirmDialogShown_) { | 75 if (this.checked) { |
76 // Leave disabled for now. The PrefCheckbox handler already set it to | 76 if (self.instantConfirmDialogShown_) |
77 // true so undo that. | 77 chrome.send('enableInstant'); |
78 Preferences.setBooleanPref(this.pref, false, this.metric); | 78 else |
79 OptionsPage.navigateToPage('instantConfirm'); | 79 OptionsPage.navigateToPage('instantConfirm'); |
| 80 } else { |
| 81 chrome.send('disableInstant'); |
80 } | 82 } |
| 83 return true; |
81 }; | 84 }; |
82 | 85 |
83 Preferences.getInstance().addEventListener('instant.confirm_dialog_shown', | 86 Preferences.getInstance().addEventListener('instant.confirm_dialog_shown', |
84 this.onInstantConfirmDialogShownChanged_.bind(this)); | 87 this.onInstantConfirmDialogShownChanged_.bind(this)); |
85 | 88 |
86 var homepageField = $('homepageURL'); | 89 var homepageField = $('homepageURL'); |
87 $('homepageUseNTPButton').onchange = | 90 $('homepageUseNTPButton').onchange = |
88 this.handleHomepageUseNTPButtonChange_.bind(this); | 91 this.handleHomepageUseNTPButtonChange_.bind(this); |
89 $('homepageUseURLButton').onchange = | 92 $('homepageUseURLButton').onchange = |
90 this.handleHomepageUseURLButtonChange_.bind(this); | 93 this.handleHomepageUseURLButtonChange_.bind(this); |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) { | 488 BrowserOptions.updateAutocompleteSuggestions = function(suggestions) { |
486 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions); | 489 BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions); |
487 }; | 490 }; |
488 | 491 |
489 // Export | 492 // Export |
490 return { | 493 return { |
491 BrowserOptions: BrowserOptions | 494 BrowserOptions: BrowserOptions |
492 }; | 495 }; |
493 | 496 |
494 }); | 497 }); |
OLD | NEW |