| 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 Profile::RegisterUserPrefs(registry); | 295 Profile::RegisterUserPrefs(registry); |
| 296 ProfileImpl::RegisterUserPrefs(registry); | 296 ProfileImpl::RegisterUserPrefs(registry); |
| 297 PromoResourceService::RegisterUserPrefs(registry); | 297 PromoResourceService::RegisterUserPrefs(registry); |
| 298 ProtocolHandlerRegistry::RegisterUserPrefs(registry); | 298 ProtocolHandlerRegistry::RegisterUserPrefs(registry); |
| 299 RegisterBrowserUserPrefs(registry); | 299 RegisterBrowserUserPrefs(registry); |
| 300 SessionStartupPref::RegisterUserPrefs(registry); | 300 SessionStartupPref::RegisterUserPrefs(registry); |
| 301 TemplateURLPrepopulateData::RegisterUserPrefs(registry); | 301 TemplateURLPrepopulateData::RegisterUserPrefs(registry); |
| 302 TranslatePrefs::RegisterUserPrefs(registry); | 302 TranslatePrefs::RegisterUserPrefs(registry); |
| 303 | 303 |
| 304 #if defined(ENABLE_CONFIGURATION_POLICY) | 304 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 305 policy::BrowserPolicyConnector::RegisterUserPrefs(registry); |
| 305 policy::URLBlacklistManager::RegisterUserPrefs(registry); | 306 policy::URLBlacklistManager::RegisterUserPrefs(registry); |
| 306 #endif | 307 #endif |
| 307 | 308 |
| 308 #if defined(ENABLE_MANAGED_USERS) | 309 #if defined(ENABLE_MANAGED_USERS) |
| 309 ManagedUserService::RegisterUserPrefs(registry); | 310 ManagedUserService::RegisterUserPrefs(registry); |
| 310 #endif | 311 #endif |
| 311 | 312 |
| 312 #if defined(ENABLE_NOTIFICATIONS) | 313 #if defined(ENABLE_NOTIFICATIONS) |
| 313 DesktopNotificationService::RegisterUserPrefs(registry); | 314 DesktopNotificationService::RegisterUserPrefs(registry); |
| 314 #endif | 315 #endif |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 } | 440 } |
| 440 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 441 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 441 | 442 |
| 442 current_version |= GOOGLE_URL_TRACKER_PREFS; | 443 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 443 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 444 current_version); | 445 current_version); |
| 445 } | 446 } |
| 446 } | 447 } |
| 447 | 448 |
| 448 } // namespace chrome | 449 } // namespace chrome |
| OLD | NEW |