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