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

Unified Diff: ios/chrome/browser/prefs/browser_prefs.mm

Issue 1456783004: Remove configuration policy on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up gyp and DEPS Created 5 years, 1 month 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: ios/chrome/browser/prefs/browser_prefs.mm
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index ec6d7a90d63a0c4d4c45a349209d36d1308ec72b..39755ad957617f6e001ff26fef81a81197fd68fe 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -34,12 +34,6 @@
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "components/policy/core/browser/browser_policy_connector.h"
-#include "components/policy/core/browser/url_blacklist_manager.h"
-#include "components/policy/core/common/policy_statistics_collector.h"
-#endif // defined(ENABLE_CONFIGURATION_POLICY)
-
namespace {
// TODO(crbug.com/525079): those preferences are not used on iOS but are
@@ -60,11 +54,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
variations::VariationsService::RegisterPrefs(registry);
web_resource::PromoResourceService::RegisterPrefs(registry);
-#if defined(ENABLE_CONFIGURATION_POLICY)
- policy::BrowserPolicyConnector::RegisterPrefs(registry);
- policy::PolicyStatisticsCollector::RegisterPrefs(registry);
-#endif
-
// Preferences related to the browser state manager.
registry->RegisterStringPref(ios::prefs::kBrowserStateLastUsed,
std::string());
@@ -103,10 +92,6 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
web_resource::PromoResourceService::RegisterProfilePrefs(registry);
ZeroSuggestProvider::RegisterProfilePrefs(registry);
-#if defined(ENABLE_CONFIGURATION_POLICY)
- policy::URLBlacklistManager::RegisterProfilePrefs(registry);
-#endif
-
registry->RegisterBooleanPref(
ios::prefs::kEnableDoNotTrack, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
« no previous file with comments | « ios/chrome/browser/net/ios_chrome_network_delegate.cc ('k') | ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698