| 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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 NewTabUI::RegisterProfilePrefs(registry); | 579 NewTabUI::RegisterProfilePrefs(registry); |
| 580 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 580 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 581 PinnedTabCodec::RegisterProfilePrefs(registry); | 581 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 582 signin::RegisterProfilePrefs(registry); | 582 signin::RegisterProfilePrefs(registry); |
| 583 #endif | 583 #endif |
| 584 | 584 |
| 585 #if !defined(OS_ANDROID) | 585 #if !defined(OS_ANDROID) |
| 586 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 586 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 587 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); | 587 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); |
| 588 gcm::RegisterProfilePrefs(registry); | 588 gcm::RegisterProfilePrefs(registry); |
| 589 StartupBrowserCreator::RegisterProfilePrefs(registry); |
| 589 #endif | 590 #endif |
| 590 | 591 |
| 591 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 592 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 592 default_apps::RegisterProfilePrefs(registry); | 593 default_apps::RegisterProfilePrefs(registry); |
| 593 #endif | 594 #endif |
| 594 | 595 |
| 595 #if defined(OS_CHROMEOS) | 596 #if defined(OS_CHROMEOS) |
| 596 arc::ArcAuthService::RegisterProfilePrefs(registry); | 597 arc::ArcAuthService::RegisterProfilePrefs(registry); |
| 597 chromeos::first_run::RegisterProfilePrefs(registry); | 598 chromeos::first_run::RegisterProfilePrefs(registry); |
| 598 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 599 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 // Added 8/2016. | 781 // Added 8/2016. |
| 781 profile_prefs->ClearPref(kStaticEncodings); | 782 profile_prefs->ClearPref(kStaticEncodings); |
| 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 783 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 783 | 784 |
| 784 // Added 9/2016. | 785 // Added 9/2016. |
| 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 786 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 787 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 787 } | 788 } |
| 788 | 789 |
| 789 } // namespace chrome | 790 } // namespace chrome |
| OLD | NEW |