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_(); |
}, |