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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 registry->RegisterListPref(prefs::kDnsHostReferralList); | 518 registry->RegisterListPref(prefs::kDnsHostReferralList); |
519 local_state->ClearPref(prefs::kDnsHostReferralList); | 519 local_state->ClearPref(prefs::kDnsHostReferralList); |
520 | 520 |
521 current_version |= DNS_PREFS; | 521 current_version |= DNS_PREFS; |
522 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 522 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
523 current_version); | 523 current_version); |
524 } | 524 } |
525 | 525 |
526 PrefService* user_prefs = profile->GetPrefs(); | 526 PrefService* user_prefs = profile->GetPrefs(); |
527 if (!(current_version & WINDOWS_PREFS)) { | 527 if (!(current_version & WINDOWS_PREFS)) { |
528 registry->RegisterIntegerPref(prefs::kDevToolsHSplitLocation, -1); | |
529 if (local_state->HasPrefPath(prefs::kDevToolsHSplitLocation)) { | |
530 user_prefs->SetInteger( | |
531 prefs::kDevToolsHSplitLocation, | |
532 local_state->GetInteger(prefs::kDevToolsHSplitLocation)); | |
533 } | |
534 local_state->ClearPref(prefs::kDevToolsHSplitLocation); | |
535 | |
536 registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); | 528 registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); |
537 if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) { | 529 if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) { |
538 const PrefService::Preference* pref = | 530 const PrefService::Preference* pref = |
539 local_state->FindPreference(prefs::kBrowserWindowPlacement); | 531 local_state->FindPreference(prefs::kBrowserWindowPlacement); |
540 DCHECK(pref); | 532 DCHECK(pref); |
541 user_prefs->Set(prefs::kBrowserWindowPlacement, | 533 user_prefs->Set(prefs::kBrowserWindowPlacement, |
542 *(pref->GetValue())); | 534 *(pref->GetValue())); |
543 } | 535 } |
544 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 536 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
545 | 537 |
(...skipping 24 matching lines...) Expand all Loading... |
570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 562 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
571 current_version); | 563 current_version); |
572 } | 564 } |
573 | 565 |
574 #if defined(OS_CHROMEOS) | 566 #if defined(OS_CHROMEOS) |
575 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 567 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
576 #endif | 568 #endif |
577 } | 569 } |
578 | 570 |
579 } // namespace chrome | 571 } // namespace chrome |
OLD | NEW |