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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 16254003: WIP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e671e318abf23fba74aadb1e1801a258560868b7..65dc09ae27d0368af446d1408db8f788de705478 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -128,6 +128,7 @@
#include "chrome/browser/policy/auto_enrollment_client.h"
#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/policy/device_status_collector.h"
+#include "chrome/browser/policy/policy_change_watcher.h"
#else
#include "chrome/browser/extensions/default_apps.h"
#endif
@@ -246,6 +247,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
chromeos::WizardController::RegisterPrefs(registry);
policy::AutoEnrollmentClient::RegisterPrefs(registry);
policy::DeviceStatusCollector::RegisterPrefs(registry);
+ policy::DevicePolicyChangeWatcher::RegisterPrefs(registry);
#endif
#if defined(OS_MACOSX)
@@ -350,6 +352,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
chromeos::Preferences::RegisterUserPrefs(registry);
chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
+ policy::UserPolicyChangeWatcher::RegisterUserPrefs(registry);
#endif
#if defined(OS_WIN)
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698