| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled"; | 302 const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled"; |
| 303 const char kDisableSpdy[] = "spdy.disabled"; | 303 const char kDisableSpdy[] = "spdy.disabled"; |
| 304 | 304 |
| 305 // Deprecated 8/2016. | 305 // Deprecated 8/2016. |
| 306 const char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings"; | 306 const char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings"; |
| 307 const char kStaticEncodings[] = "intl.static_encodings"; | 307 const char kStaticEncodings[] = "intl.static_encodings"; |
| 308 | 308 |
| 309 // Deprecated 9/2016. | 309 // Deprecated 9/2016. |
| 310 const char kWebKitUsesUniversalDetector[] = | 310 const char kWebKitUsesUniversalDetector[] = |
| 311 "webkit.webprefs.uses_universal_detector"; | 311 "webkit.webprefs.uses_universal_detector"; |
| 312 const char kWebKitAllowDisplayingInsecureContent[] = |
| 313 "webkit.webprefs.allow_displaying_insecure_content"; |
| 312 | 314 |
| 313 void DeleteWebRTCIdentityStoreDBOnFileThread( | 315 void DeleteWebRTCIdentityStoreDBOnFileThread( |
| 314 const base::FilePath& profile_path) { | 316 const base::FilePath& profile_path) { |
| 315 base::DeleteFile(profile_path.Append( | 317 base::DeleteFile(profile_path.Append( |
| 316 FILE_PATH_LITERAL("WebRTCIdentityStore")), false); | 318 FILE_PATH_LITERAL("WebRTCIdentityStore")), false); |
| 317 base::DeleteFile(profile_path.Append( | 319 base::DeleteFile(profile_path.Append( |
| 318 FILE_PATH_LITERAL("WebRTCIdentityStore-journal")), false); | 320 FILE_PATH_LITERAL("WebRTCIdentityStore-journal")), false); |
| 319 } | 321 } |
| 320 | 322 |
| 321 void DeleteWebRTCIdentityStoreDB(const Profile& profile) { | 323 void DeleteWebRTCIdentityStoreDB(const Profile& profile) { |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); | 649 registry->RegisterBooleanPref(kCheckDefaultBrowser, true); |
| 648 | 650 |
| 649 registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref, | 651 registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref, |
| 650 false); | 652 false); |
| 651 | 653 |
| 652 registry->RegisterBooleanPref(kNetworkPredictionEnabled, true); | 654 registry->RegisterBooleanPref(kNetworkPredictionEnabled, true); |
| 653 registry->RegisterBooleanPref(kDisableSpdy, false); | 655 registry->RegisterBooleanPref(kDisableSpdy, false); |
| 654 registry->RegisterStringPref(kStaticEncodings, std::string()); | 656 registry->RegisterStringPref(kStaticEncodings, std::string()); |
| 655 registry->RegisterStringPref(kRecentlySelectedEncoding, std::string()); | 657 registry->RegisterStringPref(kRecentlySelectedEncoding, std::string()); |
| 656 registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true); | 658 registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true); |
| 659 |
| 660 registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true); |
| 657 } | 661 } |
| 658 | 662 |
| 659 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 663 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 660 RegisterProfilePrefs(registry); | 664 RegisterProfilePrefs(registry); |
| 661 | 665 |
| 662 #if defined(OS_CHROMEOS) | 666 #if defined(OS_CHROMEOS) |
| 663 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); | 667 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); |
| 664 #endif | 668 #endif |
| 665 } | 669 } |
| 666 | 670 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 DeleteWebRTCIdentityStoreDB(*profile); | 758 DeleteWebRTCIdentityStoreDB(*profile); |
| 755 profile_prefs->ClearPref(kNetworkPredictionEnabled); | 759 profile_prefs->ClearPref(kNetworkPredictionEnabled); |
| 756 profile_prefs->ClearPref(kDisableSpdy); | 760 profile_prefs->ClearPref(kDisableSpdy); |
| 757 | 761 |
| 758 // Added 8/2016. | 762 // Added 8/2016. |
| 759 profile_prefs->ClearPref(kStaticEncodings); | 763 profile_prefs->ClearPref(kStaticEncodings); |
| 760 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 764 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 761 | 765 |
| 762 // Added 9/2016. | 766 // Added 9/2016. |
| 763 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 767 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 768 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 764 } | 769 } |
| 765 | 770 |
| 766 } // namespace chrome | 771 } // namespace chrome |
| OLD | NEW |