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

Unified Diff: chrome/browser/resources/options/browser_options.js

Issue 8883015: Options: Fix to enable "Use current pages" to make new URLs to open when chrome restarts. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 4fe383d9712ff86a4a47ec3b23fa9d33599e6f7b..c6d5da3b90cf2c0fa6b6f699707473914bab8707 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -247,7 +247,9 @@ cr.define('options', function() {
*/
shouldEnableCustomStartupPageControls: function(pages) {
return $('startupShowPagesButton').checked &&
- !this.startup_pages_pref_.controlledBy;
+ (this.startup_pages_pref_.controlledBy == 'recommended' ||
+ !this.startup_pages_pref_.controlledBy) &&
+ !this.startup_pages_pref_.disabled;
Joao da Silva 2011/12/10 14:53:30 Remove the "controlledBy" lines. It suffices to do
NaveenBobbili (Motorola) 2011/12/10 17:36:15 Done.
},
/**
@@ -288,6 +290,7 @@ cr.define('options', function() {
*/
handleStartupPageListChange_: function(event) {
this.startup_pages_pref_.controlledBy = event.value['controlledBy'];
Joao da Silva 2011/12/10 14:53:30 Remove the ".controlledBy" line, it's not needed.
NaveenBobbili (Motorola) 2011/12/10 17:36:15 Done.
+ this.startup_pages_pref_.disabled = event.value['disabled'];
this.updateCustomStartupPageControlStates_();
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698