| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 618 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 619 // Added 02/2015. | 619 // Added 02/2015. |
| 620 MigrateGoogleNowPrefs(profile); | 620 MigrateGoogleNowPrefs(profile); |
| 621 #endif | 621 #endif |
| 622 | 622 |
| 623 #if defined(OS_WIN) | 623 #if defined(OS_WIN) |
| 624 // Added 11/2015. | 624 // Added 11/2015. |
| 625 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); | 625 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); |
| 626 #endif | 626 #endif |
| 627 | 627 |
| 628 #if defined(OS_MACOSX) |
| 629 // Migrate the value of kHideFullscreenToolbar to kShowFullscreenToolbar if |
| 630 // it was set by the user. See crbug.com/590827. |
| 631 // Added 03/2016. |
| 632 const PrefService::Preference* hide_pref = |
| 633 profile_prefs->FindPreference(prefs::kHideFullscreenToolbar); |
| 634 if (!hide_pref->IsDefaultValue()) { |
| 635 bool hide_pref_value = |
| 636 profile_prefs->GetBoolean(prefs::kHideFullscreenToolbar); |
| 637 profile_prefs->SetBoolean(prefs::kShowFullscreenToolbar, !hide_pref_value); |
| 638 profile_prefs->ClearPref(prefs::kHideFullscreenToolbar); |
| 639 } |
| 640 #endif |
| 641 |
| 628 // Added 12/1015. | 642 // Added 12/1015. |
| 629 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); | 643 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); |
| 630 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); | 644 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); |
| 631 | 645 |
| 632 // Added 12/2015. | 646 // Added 12/2015. |
| 633 profile_prefs->ClearPref(kRestoreOnStartupMigrated); | 647 profile_prefs->ClearPref(kRestoreOnStartupMigrated); |
| 634 | 648 |
| 635 #if defined(USE_AURA) | 649 #if defined(USE_AURA) |
| 636 // Added 1/2016 | 650 // Added 1/2016 |
| 637 profile_prefs->ClearPref(kFlingMaxCancelToDownTimeInMs); | 651 profile_prefs->ClearPref(kFlingMaxCancelToDownTimeInMs); |
| 638 profile_prefs->ClearPref(kFlingMaxTapGapTimeInMs); | 652 profile_prefs->ClearPref(kFlingMaxTapGapTimeInMs); |
| 639 profile_prefs->ClearPref(kTabScrubActivationDelayInMs); | 653 profile_prefs->ClearPref(kTabScrubActivationDelayInMs); |
| 640 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); | 654 profile_prefs->ClearPref(kMaxSeparationForGestureTouchesInPixels); |
| 641 profile_prefs->ClearPref(kSemiLongPressTimeInMs); | 655 profile_prefs->ClearPref(kSemiLongPressTimeInMs); |
| 642 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); | 656 profile_prefs->ClearPref(kOverscrollHorizontalThresholdComplete); |
| 643 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); | 657 profile_prefs->ClearPref(kOverscrollVerticalThresholdComplete); |
| 644 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); | 658 profile_prefs->ClearPref(kOverscrollMinimumThresholdStart); |
| 645 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); | 659 profile_prefs->ClearPref(kOverscrollMinimumThresholdStartTouchpad); |
| 646 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); | 660 profile_prefs->ClearPref(kOverscrollVerticalThresholdStart); |
| 647 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); | 661 profile_prefs->ClearPref(kOverscrollHorizontalResistThreshold); |
| 648 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); | 662 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); |
| 649 #endif // defined(USE_AURA) | 663 #endif // defined(USE_AURA) |
| 650 } | 664 } |
| 651 | 665 |
| 652 } // namespace chrome | 666 } // namespace chrome |
| OLD | NEW |