| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 #include "chrome/browser/extensions/component_migration_helper.h" | 124 #include "chrome/browser/extensions/component_migration_helper.h" |
| 125 #include "chrome/browser/extensions/extension_web_ui.h" | 125 #include "chrome/browser/extensions/extension_web_ui.h" |
| 126 #include "chrome/browser/extensions/launch_util.h" | 126 #include "chrome/browser/extensions/launch_util.h" |
| 127 #include "chrome/browser/signin/easy_unlock_service.h" | 127 #include "chrome/browser/signin/easy_unlock_service.h" |
| 128 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 128 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| 129 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 129 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 130 #include "extensions/browser/api/runtime/runtime_api.h" | 130 #include "extensions/browser/api/runtime/runtime_api.h" |
| 131 #include "extensions/browser/extension_prefs.h" | 131 #include "extensions/browser/extension_prefs.h" |
| 132 #endif // defined(ENABLE_EXTENSIONS) | 132 #endif // defined(ENABLE_EXTENSIONS) |
| 133 | 133 |
| 134 #if defined(ENABLE_PLUGIN_INSTALLATION) | 134 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) |
| 135 #include "chrome/browser/plugins/plugins_resource_service.h" | 135 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 136 #endif | 136 #endif |
| 137 | 137 |
| 138 #if defined(ENABLE_SUPERVISED_USERS) | 138 #if defined(ENABLE_SUPERVISED_USERS) |
| 139 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | 139 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
| 140 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 140 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| 141 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" | 141 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" |
| 142 #include "chrome/browser/supervised_user/supervised_user_service.h" | 142 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 143 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 143 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 144 #endif | 144 #endif |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 371 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
| 372 | 372 |
| 373 #if defined(ENABLE_EXTENSIONS) | 373 #if defined(ENABLE_EXTENSIONS) |
| 374 EasyUnlockService::RegisterPrefs(registry); | 374 EasyUnlockService::RegisterPrefs(registry); |
| 375 #endif | 375 #endif |
| 376 | 376 |
| 377 #if defined(ENABLE_PLUGINS) | 377 #if defined(ENABLE_PLUGINS) |
| 378 PluginFinder::RegisterPrefs(registry); | 378 PluginFinder::RegisterPrefs(registry); |
| 379 #endif | 379 #endif |
| 380 | 380 |
| 381 #if defined(ENABLE_PLUGIN_INSTALLATION) | 381 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) |
| 382 PluginsResourceService::RegisterPrefs(registry); | 382 PluginsResourceService::RegisterPrefs(registry); |
| 383 #endif | 383 #endif |
| 384 | 384 |
| 385 #if defined(ENABLE_TASK_MANAGER) | 385 #if defined(ENABLE_TASK_MANAGER) |
| 386 task_manager::TaskManagerInterface::RegisterPrefs(registry); | 386 task_manager::TaskManagerInterface::RegisterPrefs(registry); |
| 387 #endif // defined(ENABLE_TASK_MANAGER) | 387 #endif // defined(ENABLE_TASK_MANAGER) |
| 388 | 388 |
| 389 #if BUILDFLAG(ENABLE_BACKGROUND) | 389 #if BUILDFLAG(ENABLE_BACKGROUND) |
| 390 BackgroundModeManager::RegisterPrefs(registry); | 390 BackgroundModeManager::RegisterPrefs(registry); |
| 391 #endif | 391 #endif |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 // Added 8/2016. | 773 // Added 8/2016. |
| 774 profile_prefs->ClearPref(kStaticEncodings); | 774 profile_prefs->ClearPref(kStaticEncodings); |
| 775 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 775 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 776 | 776 |
| 777 // Added 9/2016. | 777 // Added 9/2016. |
| 778 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 778 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 779 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 779 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 780 } | 780 } |
| 781 | 781 |
| 782 } // namespace chrome | 782 } // namespace chrome |
| OLD | NEW |