| 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 00c54dd95ad5c1996d097562680c5810ffb0fe72..5703f15d222cb3edd860893e67e0b5db507b4210 100644
|
| --- a/chrome/browser/resources/settings/search_page/search_page.js
|
| +++ b/chrome/browser/resources/settings/search_page/search_page.js
|
| @@ -8,91 +8,72 @@
|
| *
|
| * Example:
|
| *
|
| - * <core-animated-pages>
|
| + * <iron-animated-pages>
|
| * <cr-settings-search-page prefs="{{prefs}}"></cr-settings-search-page>
|
| * ... other pages ...
|
| - * </core-animated-pages>
|
| + * </iron-animated-pages>
|
| *
|
| * @group Chrome Settings Elements
|
| * @element cr-settings-search-page
|
| */
|
| -Polymer('cr-settings-search-page', {
|
| - publish: {
|
| +Polymer({
|
| + is: 'cr-settings-search-page',
|
| +
|
| + properties: {
|
| /**
|
| * Preferences state.
|
| - *
|
| - * @attribute prefs
|
| - * @type {CrSettingsPrefsElement}
|
| - * @default null
|
| + * @type {?CrSettingsPrefsElement}
|
| */
|
| - prefs: null,
|
| + prefs: {
|
| + type: Object,
|
| + notify: true,
|
| + },
|
|
|
| /**
|
| * Route for the page.
|
| - *
|
| - * @attribute route
|
| - * @type {string}
|
| - * @default ''
|
| */
|
| - route: '',
|
| + route: String,
|
|
|
| /**
|
| * Whether the page is a subpage.
|
| - *
|
| - * @attribute subpage
|
| - * @type {boolean}
|
| - * @default false
|
| */
|
| - subpage: false,
|
| + subpage: {
|
| + type: Boolean,
|
| + value: false,
|
| + },
|
|
|
| /**
|
| * ID of the page.
|
| - *
|
| - * @attribute PAGE_ID
|
| - * @const {string}
|
| - * @default 'search'
|
| */
|
| - PAGE_ID: 'search',
|
| + PAGE_ID: {
|
| + type: String,
|
| + value: 'search',
|
| + },
|
|
|
| /**
|
| * Title for the page header and navigation menu.
|
| - *
|
| - * @attribute pageTitle
|
| - * @type {string}
|
| */
|
| - pageTitle: loadTimeData.getString('searchPageTitle'),
|
| + pageTitle: {
|
| + type: String,
|
| + value: function() { return loadTimeData.getString('searchPageTitle'); },
|
| + },
|
|
|
| /**
|
| - * Name of the 'core-icon' to be shown in the settings-page-header.
|
| - *
|
| - * @attribute icon
|
| - * @type {string}
|
| - * @default 'search'
|
| + * Name of the 'iron-icon' to be shown in the settings-page-header.
|
| */
|
| - icon: 'search',
|
| + icon: {
|
| + type: Boolean,
|
| + value: 'search',
|
| + },
|
|
|
| /**
|
| * List of default search engines available.
|
| - *
|
| - * @attribute searchEngines
|
| - * @type {Array<!SearchEngine>}
|
| - * @default null
|
| - */
|
| - searchEngines: null,
|
| -
|
| - /**
|
| - * GUID of the currently selected default search engine.
|
| - *
|
| - * @attribute defaultEngineGuid
|
| - * @type {string}
|
| - * @default ''
|
| + * @type {?Array<!SearchEngine>}
|
| */
|
| - defaultEngineGuid: '',
|
| - },
|
| -
|
| - /** @override */
|
| - created: function() {
|
| - this.searchEngines = [];
|
| + searchEngines: {
|
| + type: Array,
|
| + value: function() { return []; },
|
| + },
|
| },
|
|
|
| /** @override */
|
| @@ -106,9 +87,11 @@ Polymer('cr-settings-search-page', {
|
| /**
|
| * 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.defaultEngineGuid);
|
| + defaultEngineGuidChanged_: function() {
|
| + chrome.searchEnginesPrivate.setSelectedSearchEngine(
|
| + this.$.searchEnginesMenu.value);
|
| },
|
|
|
|
|
| @@ -125,7 +108,7 @@ Polymer('cr-settings-search-page', {
|
| chrome.searchEnginesPrivate.SearchEngineType.DEFAULT) {
|
| defaultEngines.push(engine);
|
| if (engine.isSelected) {
|
| - this.defaultEngineGuid = engine.guid;
|
| + this.$.searchEnginesMenu.value = engine.guid;
|
| }
|
| }
|
| }, this);
|
|
|