| 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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 | 252 |
| 253 #if defined(ENABLE_AUTOFILL_DIALOG) | 253 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 254 autofill::AutofillDialogController::RegisterPrefs(registry); | 254 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 255 #endif | 255 #endif |
| 256 | 256 |
| 257 #if defined(ENABLE_CONFIGURATION_POLICY) | 257 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 258 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 258 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
| 259 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 259 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
| 260 #endif | 260 #endif |
| 261 | 261 |
| 262 #if defined(ENABLE_NOTIFICATIONS) | 262 #if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID) |
| 263 // Android does not use the message center for notifications. |
| 263 MessageCenterNotificationManager::RegisterPrefs(registry); | 264 MessageCenterNotificationManager::RegisterPrefs(registry); |
| 264 #endif | 265 #endif |
| 265 | 266 |
| 266 #if defined(ENABLE_PLUGINS) | 267 #if defined(ENABLE_PLUGINS) |
| 267 PluginFinder::RegisterPrefs(registry); | 268 PluginFinder::RegisterPrefs(registry); |
| 268 #endif | 269 #endif |
| 269 | 270 |
| 270 #if defined(ENABLE_PLUGIN_INSTALLATION) | 271 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 271 PluginsResourceService::RegisterPrefs(registry); | 272 PluginsResourceService::RegisterPrefs(registry); |
| 272 #endif | 273 #endif |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 576 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 576 current_version); | 577 current_version); |
| 577 } | 578 } |
| 578 | 579 |
| 579 #if defined(OS_CHROMEOS) | 580 #if defined(OS_CHROMEOS) |
| 580 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 581 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 581 #endif | 582 #endif |
| 582 } | 583 } |
| 583 | 584 |
| 584 } // namespace chrome | 585 } // namespace chrome |
| OLD | NEW |