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

Unified Diff: chrome/browser/resources/settings/on_startup_page/on_startup_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/on_startup_page.js
diff --git a/chrome/browser/resources/settings/on_startup_page/on_startup_page.js b/chrome/browser/resources/settings/on_startup_page/on_startup_page.js
index 7737886378bdcc1aece1f7d360a760976e13c189..392552b0ea734bb3a01935454cdadfc6f1b23f0a 100644
--- a/chrome/browser/resources/settings/on_startup_page/on_startup_page.js
+++ b/chrome/browser/resources/settings/on_startup_page/on_startup_page.js
@@ -85,12 +85,17 @@ Polymer({
'prefValueChanged(prefValue)',
],
+ /** @override */
attached: function() {
- this.prefValue = this.prefs.session.restore_on_startup.value;
+ var restoreOnStartup =
+ this.get('session.restore_on_startup.value', this.prefs);
+ if (restoreOnStartup != undefined)
+ this.prefValue = /** @type {number} */(restoreOnStartup);
},
+ /** @private */
prefValueChanged: function(prefValue) {
- this.set('prefs.session.restore_on_startup.value', parseInt(prefValue));
+ this.set('prefs.session.restore_on_startup.value', parseInt(prefValue, 10));
},
/** @private */
@@ -100,6 +105,6 @@ Polymer({
/** @private */
onSetPagesTap_: function() {
- this.$.pages.navigateTo('startup-urls');
+ this.$.pages.setSubpageChain(['startup-urls']);
},
});

Powered by Google App Engine
This is Rietveld 408576698