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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/configuration_policy_handler_list.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/configuration_policy_handler.h" 9 #include "chrome/browser/policy/configuration_policy_handler.h"
10 #include "chrome/browser/policy/policy_error_map.h" 10 #include "chrome/browser/policy/policy_error_map.h"
(...skipping 21 matching lines...) Expand all
32 32
33 // List of policy types to preference names. This is used for simple policies 33 // List of policy types to preference names. This is used for simple policies
34 // that directly map to a single preference. 34 // that directly map to a single preference.
35 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { 35 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
36 { key::kHomepageLocation, 36 { key::kHomepageLocation,
37 prefs::kHomePage, 37 prefs::kHomePage,
38 Value::TYPE_STRING }, 38 Value::TYPE_STRING },
39 { key::kHomepageIsNewTabPage, 39 { key::kHomepageIsNewTabPage,
40 prefs::kHomePageIsNewTabPage, 40 prefs::kHomePageIsNewTabPage,
41 Value::TYPE_BOOLEAN }, 41 Value::TYPE_BOOLEAN },
42 { key::kRestoreOnStartupURLs,
43 prefs::kURLsToRestoreOnStartup,
44 Value::TYPE_LIST },
45 { key::kAlternateErrorPagesEnabled, 42 { key::kAlternateErrorPagesEnabled,
46 prefs::kAlternateErrorPagesEnabled, 43 prefs::kAlternateErrorPagesEnabled,
47 Value::TYPE_BOOLEAN }, 44 Value::TYPE_BOOLEAN },
48 { key::kSearchSuggestEnabled, 45 { key::kSearchSuggestEnabled,
49 prefs::kSearchSuggestEnabled, 46 prefs::kSearchSuggestEnabled,
50 Value::TYPE_BOOLEAN }, 47 Value::TYPE_BOOLEAN },
51 { key::kDnsPrefetchingEnabled, 48 { key::kDnsPrefetchingEnabled,
52 prefs::kNetworkPredictionEnabled, 49 prefs::kNetworkPredictionEnabled,
53 Value::TYPE_BOOLEAN }, 50 Value::TYPE_BOOLEAN },
54 { key::kDisableSpdy, 51 { key::kDisableSpdy,
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } 313 }
317 314
318 handlers_.push_back(new AutofillPolicyHandler()); 315 handlers_.push_back(new AutofillPolicyHandler());
319 handlers_.push_back(new DefaultSearchPolicyHandler()); 316 handlers_.push_back(new DefaultSearchPolicyHandler());
320 handlers_.push_back(new DiskCacheDirPolicyHandler()); 317 handlers_.push_back(new DiskCacheDirPolicyHandler());
321 handlers_.push_back(new FileSelectionDialogsHandler()); 318 handlers_.push_back(new FileSelectionDialogsHandler());
322 handlers_.push_back(new IncognitoModePolicyHandler()); 319 handlers_.push_back(new IncognitoModePolicyHandler());
323 handlers_.push_back(new JavascriptPolicyHandler()); 320 handlers_.push_back(new JavascriptPolicyHandler());
324 handlers_.push_back(new ProxyPolicyHandler()); 321 handlers_.push_back(new ProxyPolicyHandler());
325 handlers_.push_back(new RestoreOnStartupPolicyHandler()); 322 handlers_.push_back(new RestoreOnStartupPolicyHandler());
323 handlers_.push_back(new RestoreOnStartupURLsPolicyHandler());
326 handlers_.push_back(new SyncPolicyHandler()); 324 handlers_.push_back(new SyncPolicyHandler());
327 325
328 handlers_.push_back( 326 handlers_.push_back(
329 new ExtensionListPolicyHandler(key::kExtensionInstallWhitelist, 327 new ExtensionListPolicyHandler(key::kExtensionInstallWhitelist,
330 prefs::kExtensionInstallAllowList, 328 prefs::kExtensionInstallAllowList,
331 false)); 329 false));
332 handlers_.push_back( 330 handlers_.push_back(
333 new ExtensionListPolicyHandler(key::kExtensionInstallBlacklist, 331 new ExtensionListPolicyHandler(key::kExtensionInstallBlacklist,
334 prefs::kExtensionInstallDenyList, 332 prefs::kExtensionInstallDenyList,
335 true)); 333 true));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 } 376 }
379 377
380 void ConfigurationPolicyHandlerList::PrepareForDisplaying( 378 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
381 PolicyMap* policies) const { 379 PolicyMap* policies) const {
382 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; 380 std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
383 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) 381 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
384 (*handler)->PrepareForDisplaying(policies); 382 (*handler)->PrepareForDisplaying(policies);
385 } 383 }
386 384
387 } // namespace policy 385 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698