| Index: chrome/browser/resources/settings/search_page/search_page.js
|
| diff --git a/chrome/browser/resources/settings/search_page/search_page.js b/chrome/browser/resources/settings/search_page/search_page.js
|
| index 0f8b3cbad16c70ce713db4da33a02b5941fbb2eb..fc5fdaafd1ac79fbcbf2d6c4a4f471c3a717866a 100644
|
| --- a/chrome/browser/resources/settings/search_page/search_page.js
|
| +++ b/chrome/browser/resources/settings/search_page/search_page.js
|
| @@ -6,13 +6,6 @@
|
| * @fileoverview
|
| * 'settings-search-page' is the settings page containing search settings.
|
| *
|
| - * Example:
|
| - *
|
| - * <iron-animated-pages>
|
| - * <settings-search-page prefs="{{prefs}}"></settings-search-page>
|
| - * ... other pages ...
|
| - * </iron-animated-pages>
|
| - *
|
| * @group Chrome Settings Elements
|
| * @element settings-search-page
|
| */
|
| @@ -30,56 +23,38 @@ Polymer({
|
|
|
| /**
|
| * List of default search engines available.
|
| - * @type {?Array<!SearchEngine>}
|
| + * @private {!Array<!SearchEngine>}
|
| */
|
| - searchEngines: {
|
| + searchEngines_: {
|
| type: Array,
|
| - value: function() { return []; },
|
| + value: function() { return []; }
|
| },
|
| +
|
| + /** @private {!settings.SearchEnginesBrowserProxy} */
|
| + browserProxy_: Object,
|
| },
|
|
|
| /** @override */
|
| created: function() {
|
| - chrome.searchEnginesPrivate.onSearchEnginesChanged.addListener(
|
| - this.updateSearchEngines_.bind(this));
|
| - chrome.searchEnginesPrivate.getSearchEngines(
|
| - this.updateSearchEngines_.bind(this));
|
| + this.browserProxy_ = settings.SearchEnginesBrowserProxyImpl.getInstance();
|
| },
|
|
|
| - /**
|
| - * Persists the new default search engine back to Chrome. Called when the
|
| - * user selects a new default in the search engines dropdown.
|
| - * @private
|
| - */
|
| - defaultEngineGuidChanged_: function() {
|
| - chrome.searchEnginesPrivate.setSelectedSearchEngine(
|
| - this.$.searchEnginesMenu.value);
|
| + /** @override */
|
| + ready: function() {
|
| + var updateSearchEngines = function(searchEngines) {
|
| + this.set('searchEngines_', searchEngines.defaults);
|
| + }.bind(this);
|
| + this.browserProxy_.getSearchEnginesList().then(updateSearchEngines);
|
| + cr.addWebUIListener('search-engines-changed', updateSearchEngines);
|
| },
|
|
|
| -
|
| - /**
|
| - * Updates the list of default search engines based on the given |engines|.
|
| - * @param {!Array<!SearchEngine>} engines All the search engines.
|
| - * @private
|
| - */
|
| - updateSearchEngines_: function(engines) {
|
| - var defaultEngines = [];
|
| -
|
| - engines.forEach(function(engine) {
|
| - if (engine.type ==
|
| - chrome.searchEnginesPrivate.SearchEngineType.DEFAULT) {
|
| - defaultEngines.push(engine);
|
| - if (engine.isSelected) {
|
| - this.$.searchEnginesMenu.value = engine.guid;
|
| - }
|
| - }
|
| - }, this);
|
| -
|
| - this.searchEngines = defaultEngines;
|
| + /** @private */
|
| + onManageSearchEnginesTap_: function() {
|
| + this.$.pages.setSubpageChain(['search-engines']);
|
| },
|
|
|
| /** @private */
|
| - onSearchEnginesTap_: function() {
|
| - this.$.pages.setSubpageChain(['search-engines']);
|
| + onDefaultEngineChanged_: function() {
|
| + this.browserProxy_.setDefaultSearchEngine(this.$.searchEnginesMenu.value);
|
| },
|
| });
|
|
|