| 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 557   SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 557   SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 
| 558   SupervisedUserSyncService::RegisterProfilePrefs(registry); | 558   SupervisedUserSyncService::RegisterProfilePrefs(registry); | 
| 559 #endif | 559 #endif | 
| 560   ChildAccountService::RegisterProfilePrefs(registry); | 560   ChildAccountService::RegisterProfilePrefs(registry); | 
| 561   SupervisedUserService::RegisterProfilePrefs(registry); | 561   SupervisedUserService::RegisterProfilePrefs(registry); | 
| 562   SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 562   SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 
| 563 #endif | 563 #endif | 
| 564 | 564 | 
| 565 #if BUILDFLAG(ANDROID_JAVA_UI) | 565 #if BUILDFLAG(ANDROID_JAVA_UI) | 
| 566   variations::VariationsService::RegisterProfilePrefs(registry); | 566   variations::VariationsService::RegisterProfilePrefs(registry); | 
| 567   ntp_tiles::PopularSites::RegisterProfilePrefs(registry); | 567   ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry); | 
| 568   NewTabPagePrefs::RegisterProfilePrefs(registry); | 568   NewTabPagePrefs::RegisterProfilePrefs(registry); | 
| 569   PartnerBookmarksShim::RegisterProfilePrefs(registry); | 569   PartnerBookmarksShim::RegisterProfilePrefs(registry); | 
| 570 #else | 570 #else | 
| 571   AppShortcutManager::RegisterProfilePrefs(registry); | 571   AppShortcutManager::RegisterProfilePrefs(registry); | 
| 572   DeviceIDFetcher::RegisterProfilePrefs(registry); | 572   DeviceIDFetcher::RegisterProfilePrefs(registry); | 
| 573   DevToolsWindow::RegisterProfilePrefs(registry); | 573   DevToolsWindow::RegisterProfilePrefs(registry); | 
| 574 #if BUILDFLAG(ENABLE_APP_LIST) | 574 #if BUILDFLAG(ENABLE_APP_LIST) | 
| 575   DriveAppMapping::RegisterProfilePrefs(registry); | 575   DriveAppMapping::RegisterProfilePrefs(registry); | 
| 576   app_list::AppListSyncableService::RegisterProfilePrefs(registry); | 576   app_list::AppListSyncableService::RegisterProfilePrefs(registry); | 
| 577 #endif | 577 #endif | 
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 790   // Added 8/2016. | 790   // Added 8/2016. | 
| 791   profile_prefs->ClearPref(kStaticEncodings); | 791   profile_prefs->ClearPref(kStaticEncodings); | 
| 792   profile_prefs->ClearPref(kRecentlySelectedEncoding); | 792   profile_prefs->ClearPref(kRecentlySelectedEncoding); | 
| 793 | 793 | 
| 794   // Added 9/2016. | 794   // Added 9/2016. | 
| 795   profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 795   profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 
| 796   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 796   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 
| 797 } | 797 } | 
| 798 | 798 | 
| 799 }  // namespace chrome | 799 }  // namespace chrome | 
| OLD | NEW | 
|---|