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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 // M38. | 533 // M38. |
534 chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs); | 534 chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs); |
535 #endif | 535 #endif |
536 | 536 |
537 PromoResourceService::MigrateUserPrefs(prefs); | 537 PromoResourceService::MigrateUserPrefs(prefs); |
538 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); | 538 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); |
539 | 539 |
540 #if defined(OS_MACOSX) && !defined(OS_IOS) | 540 #if defined(OS_MACOSX) && !defined(OS_IOS) |
541 autofill::AutofillManager::MigrateUserPrefs(prefs); | 541 autofill::AutofillManager::MigrateUserPrefs(prefs); |
542 #endif // defined(OS_MACOSX) && !defined(OS_IOS) | 542 #endif // defined(OS_MACOSX) && !defined(OS_IOS) |
| 543 |
| 544 chrome::MigrateBrowserUIUserPrefs(prefs); |
543 } | 545 } |
544 | 546 |
545 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { | 547 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { |
546 // Copy pref values which have been migrated to user_prefs from local_state, | 548 // Copy pref values which have been migrated to user_prefs from local_state, |
547 // or remove them from local_state outright, if copying is not required. | 549 // or remove them from local_state outright, if copying is not required. |
548 int current_version = | 550 int current_version = |
549 local_state->GetInteger(prefs::kMultipleProfilePrefMigration); | 551 local_state->GetInteger(prefs::kMultipleProfilePrefMigration); |
550 PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>( | 552 PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>( |
551 local_state->DeprecatedGetPrefRegistry()); | 553 local_state->DeprecatedGetPrefRegistry()); |
552 | 554 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 #if defined(OS_CHROMEOS) | 611 #if defined(OS_CHROMEOS) |
610 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 612 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
611 #endif | 613 #endif |
612 | 614 |
613 #if defined(TOOLKIT_VIEWS) | 615 #if defined(TOOLKIT_VIEWS) |
614 MigrateBrowserTabStripPrefs(local_state); | 616 MigrateBrowserTabStripPrefs(local_state); |
615 #endif | 617 #endif |
616 } | 618 } |
617 | 619 |
618 } // namespace chrome | 620 } // namespace chrome |
OLD | NEW |