Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4176)

Unified Diff: chrome/browser/resources/settings/on_startup_page/startup_urls_page.js

Issue 1341463002: Add on_startup_page/compiled_resources.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
},

Powered by Google App Engine
This is Rietveld 408576698