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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 10417032: Disable sync promo when RestoreOnStartupURLs policy is used (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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/policy/configuration_policy_handler_list.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index f3664cf0a1b73e682f98344bfdf5f2c1d0cf0558..23f79bb438a204b61f54753a1dc756a3d0559f32 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -39,9 +39,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
{ key::kHomepageIsNewTabPage,
prefs::kHomePageIsNewTabPage,
Value::TYPE_BOOLEAN },
- { key::kRestoreOnStartupURLs,
- prefs::kURLsToRestoreOnStartup,
- Value::TYPE_LIST },
{ key::kAlternateErrorPagesEnabled,
prefs::kAlternateErrorPagesEnabled,
Value::TYPE_BOOLEAN },
@@ -323,6 +320,7 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
handlers_.push_back(new JavascriptPolicyHandler());
handlers_.push_back(new ProxyPolicyHandler());
handlers_.push_back(new RestoreOnStartupPolicyHandler());
+ handlers_.push_back(new RestoreOnStartupURLsPolicyHandler());
handlers_.push_back(new SyncPolicyHandler());
handlers_.push_back(

Powered by Google App Engine
This is Rietveld 408576698