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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 } // namespace | 220 } // namespace |
221 | 221 |
222 namespace chrome { | 222 namespace chrome { |
223 | 223 |
224 void RegisterLocalState(PrefRegistrySimple* registry) { | 224 void RegisterLocalState(PrefRegistrySimple* registry) { |
225 // Prefs in Local State. | 225 // Prefs in Local State. |
226 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 226 registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
227 | 227 |
228 // Please keep this list alphabetized. | 228 // Please keep this list alphabetized. |
229 AppListService::RegisterPrefs(registry); | 229 AppListService::RegisterPrefs(registry); |
| 230 apps::RegisterPrefs(registry); |
230 browser_shutdown::RegisterPrefs(registry); | 231 browser_shutdown::RegisterPrefs(registry); |
231 BrowserProcessImpl::RegisterPrefs(registry); | 232 BrowserProcessImpl::RegisterPrefs(registry); |
232 chrome_prefs::RegisterPrefs(registry); | 233 chrome_prefs::RegisterPrefs(registry); |
233 chrome_variations::VariationsService::RegisterPrefs(registry); | 234 chrome_variations::VariationsService::RegisterPrefs(registry); |
234 component_updater::RegisterPrefsForRecoveryComponent(registry); | 235 component_updater::RegisterPrefsForRecoveryComponent(registry); |
235 ExternalProtocolHandler::RegisterPrefs(registry); | 236 ExternalProtocolHandler::RegisterPrefs(registry); |
236 FlagsUI::RegisterPrefs(registry); | 237 FlagsUI::RegisterPrefs(registry); |
237 geolocation::RegisterPrefs(registry); | 238 geolocation::RegisterPrefs(registry); |
238 GLStringManager::RegisterPrefs(registry); | 239 GLStringManager::RegisterPrefs(registry); |
239 GpuModeManager::RegisterPrefs(registry); | 240 GpuModeManager::RegisterPrefs(registry); |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 584 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
584 current_version); | 585 current_version); |
585 } | 586 } |
586 | 587 |
587 #if defined(OS_CHROMEOS) | 588 #if defined(OS_CHROMEOS) |
588 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 589 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
589 #endif | 590 #endif |
590 } | 591 } |
591 | 592 |
592 } // namespace chrome | 593 } // namespace chrome |
OLD | NEW |