| Index: chrome/browser/resources/settings/on_startup_page/startup_urls_page.js
|
| diff --git a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js
|
| index f39a86c62d1d7791d67d8e77e415ff809d31f49c..3df1a52233ba88011dfa62322c89d68ec832a259 100644
|
| --- a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js
|
| +++ b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js
|
| @@ -60,7 +60,7 @@ Polymer({
|
| */
|
| pageTitle: {
|
| type: String,
|
| - value: loadTimeData.getString('onStartupSetPages'),
|
| + value: function() { return loadTimeData.getString('onStartupSetPages'); },
|
| readOnly: true
|
| },
|
|
|
| @@ -85,7 +85,9 @@ Polymer({
|
| },
|
|
|
| attached: function() {
|
| - this.savedUrlList = this.prefs.session.startup_urls.value.slice();
|
| + var startupUrls = this.get('session.startup_urls.value', this.prefs);
|
| + if (startupUrls)
|
| + this.savedUrlList = startupUrls.slice();
|
| },
|
|
|
| /** @private */
|
| @@ -104,10 +106,13 @@ Polymer({
|
| if (!value)
|
| return;
|
| this.push('prefs.session.startup_urls.value', value);
|
| - this.newUrl = undefined;
|
| + this.newUrl = '';
|
| },
|
|
|
| - /** @private */
|
| + /**
|
| + * @param {!{model: !{index: number}}} e
|
| + * @private
|
| + */
|
| onRemoveUrlTap_: function(e) {
|
| this.splice('prefs.session.startup_urls.value', e.model.index, 1);
|
| },
|
|
|