| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "components/translate/core/browser/language_model.h" | 103 #include "components/translate/core/browser/language_model.h" |
| 104 #include "components/translate/core/browser/translate_prefs.h" | 104 #include "components/translate/core/browser/translate_prefs.h" |
| 105 #include "components/update_client/update_client.h" | 105 #include "components/update_client/update_client.h" |
| 106 #include "components/variations/service/variations_service.h" | 106 #include "components/variations/service/variations_service.h" |
| 107 #include "content/public/browser/browser_thread.h" | 107 #include "content/public/browser/browser_thread.h" |
| 108 #include "content/public/browser/render_process_host.h" | 108 #include "content/public/browser/render_process_host.h" |
| 109 #include "net/http/http_server_properties_manager.h" | 109 #include "net/http/http_server_properties_manager.h" |
| 110 | 110 |
| 111 #if BUILDFLAG(ENABLE_APP_LIST) | 111 #if BUILDFLAG(ENABLE_APP_LIST) |
| 112 #include "chrome/browser/apps/drive/drive_app_mapping.h" | 112 #include "chrome/browser/apps/drive/drive_app_mapping.h" |
| 113 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| 113 #endif | 114 #endif |
| 114 | 115 |
| 115 #if BUILDFLAG(ENABLE_BACKGROUND) | 116 #if BUILDFLAG(ENABLE_BACKGROUND) |
| 116 #include "chrome/browser/background/background_mode_manager.h" | 117 #include "chrome/browser/background/background_mode_manager.h" |
| 117 #endif | 118 #endif |
| 118 | 119 |
| 119 #if defined(ENABLE_EXTENSIONS) | 120 #if defined(ENABLE_EXTENSIONS) |
| 120 #include "chrome/browser/accessibility/animation_policy_prefs.h" | 121 #include "chrome/browser/accessibility/animation_policy_prefs.h" |
| 121 #include "chrome/browser/apps/shortcut_manager.h" | 122 #include "chrome/browser/apps/shortcut_manager.h" |
| 122 #include "chrome/browser/extensions/activity_log/activity_log.h" | 123 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); | 560 ntp_tiles::MostVisitedSites::RegisterProfilePrefs(registry); |
| 560 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); | 561 ntp_tiles::PopularSites::RegisterProfilePrefs(registry); |
| 561 NewTabPagePrefs::RegisterProfilePrefs(registry); | 562 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 562 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 563 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 563 #else | 564 #else |
| 564 AppShortcutManager::RegisterProfilePrefs(registry); | 565 AppShortcutManager::RegisterProfilePrefs(registry); |
| 565 DeviceIDFetcher::RegisterProfilePrefs(registry); | 566 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 566 DevToolsWindow::RegisterProfilePrefs(registry); | 567 DevToolsWindow::RegisterProfilePrefs(registry); |
| 567 #if BUILDFLAG(ENABLE_APP_LIST) | 568 #if BUILDFLAG(ENABLE_APP_LIST) |
| 568 DriveAppMapping::RegisterProfilePrefs(registry); | 569 DriveAppMapping::RegisterProfilePrefs(registry); |
| 570 app_list::AppListSyncableService::RegisterProfilePrefs(registry); |
| 569 #endif | 571 #endif |
| 570 extensions::CommandService::RegisterProfilePrefs(registry); | 572 extensions::CommandService::RegisterProfilePrefs(registry); |
| 571 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 573 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 572 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 574 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| 573 first_run::RegisterProfilePrefs(registry); | 575 first_run::RegisterProfilePrefs(registry); |
| 574 NewTabUI::RegisterProfilePrefs(registry); | 576 NewTabUI::RegisterProfilePrefs(registry); |
| 575 PepperFlashSettingsManager::RegisterProfilePrefs(registry); | 577 PepperFlashSettingsManager::RegisterProfilePrefs(registry); |
| 576 PinnedTabCodec::RegisterProfilePrefs(registry); | 578 PinnedTabCodec::RegisterProfilePrefs(registry); |
| 577 signin::RegisterProfilePrefs(registry); | 579 signin::RegisterProfilePrefs(registry); |
| 578 #endif | 580 #endif |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 // Added 8/2016. | 776 // Added 8/2016. |
| 775 profile_prefs->ClearPref(kStaticEncodings); | 777 profile_prefs->ClearPref(kStaticEncodings); |
| 776 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 778 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 777 | 779 |
| 778 // Added 9/2016. | 780 // Added 9/2016. |
| 779 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 781 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 780 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 782 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 781 } | 783 } |
| 782 | 784 |
| 783 } // namespace chrome | 785 } // namespace chrome |
| OLD | NEW |