OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
6 | 6 |
7 #include "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 Profile::RegisterUserPrefs(registry); | 293 Profile::RegisterUserPrefs(registry); |
294 ProfileImpl::RegisterUserPrefs(registry); | 294 ProfileImpl::RegisterUserPrefs(registry); |
295 PromoResourceService::RegisterUserPrefs(registry); | 295 PromoResourceService::RegisterUserPrefs(registry); |
296 ProtocolHandlerRegistry::RegisterUserPrefs(registry); | 296 ProtocolHandlerRegistry::RegisterUserPrefs(registry); |
297 RegisterBrowserUserPrefs(registry); | 297 RegisterBrowserUserPrefs(registry); |
298 SessionStartupPref::RegisterUserPrefs(registry); | 298 SessionStartupPref::RegisterUserPrefs(registry); |
299 TemplateURLPrepopulateData::RegisterUserPrefs(registry); | 299 TemplateURLPrepopulateData::RegisterUserPrefs(registry); |
300 TranslatePrefs::RegisterUserPrefs(registry); | 300 TranslatePrefs::RegisterUserPrefs(registry); |
301 | 301 |
302 #if defined(ENABLE_CONFIGURATION_POLICY) | 302 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 303 policy::BrowserPolicyConnector::RegisterUserPrefs(registry); |
303 policy::URLBlacklistManager::RegisterUserPrefs(registry); | 304 policy::URLBlacklistManager::RegisterUserPrefs(registry); |
304 #endif | 305 #endif |
305 | 306 |
306 #if defined(ENABLE_MANAGED_USERS) | 307 #if defined(ENABLE_MANAGED_USERS) |
307 ManagedUserService::RegisterUserPrefs(registry); | 308 ManagedUserService::RegisterUserPrefs(registry); |
308 #endif | 309 #endif |
309 | 310 |
310 #if defined(ENABLE_NOTIFICATIONS) | 311 #if defined(ENABLE_NOTIFICATIONS) |
311 DesktopNotificationService::RegisterUserPrefs(registry); | 312 DesktopNotificationService::RegisterUserPrefs(registry); |
312 #endif | 313 #endif |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 } | 438 } |
438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 439 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
439 | 440 |
440 current_version |= GOOGLE_URL_TRACKER_PREFS; | 441 current_version |= GOOGLE_URL_TRACKER_PREFS; |
441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 442 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
442 current_version); | 443 current_version); |
443 } | 444 } |
444 } | 445 } |
445 | 446 |
446 } // namespace chrome | 447 } // namespace chrome |
OLD | NEW |