| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); | 635 registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false); |
| 636 #endif | 636 #endif |
| 637 | 637 |
| 638 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); | 638 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); |
| 639 | 639 |
| 640 registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref, | 640 registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref, |
| 641 false); | 641 false); |
| 642 | 642 |
| 643 registry->RegisterBooleanPref(kNetworkPredictionEnabled, true); | 643 registry->RegisterBooleanPref(kNetworkPredictionEnabled, true); |
| 644 registry->RegisterBooleanPref(kDisableSpdy, false); | 644 registry->RegisterBooleanPref(kDisableSpdy, false); |
| 645 registry->RegisterStringPref(prefs::kStaticEncodings, std::string()); |
| 646 registry->RegisterStringPref(prefs::kRecentlySelectedEncoding, std::string()); |
| 645 } | 647 } |
| 646 | 648 |
| 647 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 649 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 648 RegisterProfilePrefs(registry); | 650 RegisterProfilePrefs(registry); |
| 649 | 651 |
| 650 #if defined(OS_CHROMEOS) | 652 #if defined(OS_CHROMEOS) |
| 651 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); | 653 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); |
| 652 #endif | 654 #endif |
| 653 } | 655 } |
| 654 | 656 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 } | 737 } |
| 736 profile_prefs->ClearPref(kCheckDefaultBrowser); | 738 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 737 | 739 |
| 738 // Added 5/2016. | 740 // Added 5/2016. |
| 739 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 741 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 740 | 742 |
| 741 // Added 7/2016. | 743 // Added 7/2016. |
| 742 DeleteWebRTCIdentityStoreDB(profile); | 744 DeleteWebRTCIdentityStoreDB(profile); |
| 743 profile_prefs->ClearPref(kNetworkPredictionEnabled); | 745 profile_prefs->ClearPref(kNetworkPredictionEnabled); |
| 744 profile_prefs->ClearPref(kDisableSpdy); | 746 profile_prefs->ClearPref(kDisableSpdy); |
| 747 |
| 748 // Added 8/2016. |
| 749 profile_prefs->ClearPref(prefs::kStaticEncodings); |
| 750 profile_prefs->ClearPref(prefs::kRecentlySelectedEncoding); |
| 745 } | 751 } |
| 746 | 752 |
| 747 } // namespace chrome | 753 } // namespace chrome |
| OLD | NEW |