| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 prefs->ClearPref(kBackupPref); | 517 prefs->ClearPref(kBackupPref); |
| 518 | 518 |
| 519 #if !defined(OS_ANDROID) | 519 #if !defined(OS_ANDROID) |
| 520 // Cleanup now-removed sync promo error message preference. | 520 // Cleanup now-removed sync promo error message preference. |
| 521 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442). | 521 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442). |
| 522 prefs->ClearPref(kSyncPromoErrorMessage); | 522 prefs->ClearPref(kSyncPromoErrorMessage); |
| 523 #endif | 523 #endif |
| 524 | 524 |
| 525 PromoResourceService::MigrateUserPrefs(prefs); | 525 PromoResourceService::MigrateUserPrefs(prefs); |
| 526 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); | 526 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); |
| 527 chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs); |
| 527 | 528 |
| 528 #if defined(OS_MACOSX) && !defined(OS_IOS) | 529 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 529 autofill::AutofillManager::MigrateUserPrefs(prefs); | 530 autofill::AutofillManager::MigrateUserPrefs(prefs); |
| 530 #endif // defined(OS_MACOSX) && !defined(OS_IOS) | 531 #endif // defined(OS_MACOSX) && !defined(OS_IOS) |
| 531 } | 532 } |
| 532 | 533 |
| 533 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { | 534 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { |
| 534 // Copy pref values which have been migrated to user_prefs from local_state, | 535 // Copy pref values which have been migrated to user_prefs from local_state, |
| 535 // or remove them from local_state outright, if copying is not required. | 536 // or remove them from local_state outright, if copying is not required. |
| 536 int current_version = | 537 int current_version = |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 #if defined(OS_CHROMEOS) | 594 #if defined(OS_CHROMEOS) |
| 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 595 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 595 #endif | 596 #endif |
| 596 | 597 |
| 597 #if defined(TOOLKIT_VIEWS) | 598 #if defined(TOOLKIT_VIEWS) |
| 598 MigrateBrowserTabStripPrefs(local_state); | 599 MigrateBrowserTabStripPrefs(local_state); |
| 599 #endif | 600 #endif |
| 600 } | 601 } |
| 601 | 602 |
| 602 } // namespace chrome | 603 } // namespace chrome |
| OLD | NEW |