| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 #endif | 379 #endif |
| 380 | 380 |
| 381 #if BUILDFLAG(ENABLE_PLUGINS) | 381 #if BUILDFLAG(ENABLE_PLUGINS) |
| 382 PluginFinder::RegisterPrefs(registry); | 382 PluginFinder::RegisterPrefs(registry); |
| 383 #endif | 383 #endif |
| 384 | 384 |
| 385 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) | 385 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) |
| 386 PluginsResourceService::RegisterPrefs(registry); | 386 PluginsResourceService::RegisterPrefs(registry); |
| 387 #endif | 387 #endif |
| 388 | 388 |
| 389 #if defined(ENABLE_TASK_MANAGER) | 389 #if !defined(OS_ANDROID) |
| 390 task_manager::TaskManagerInterface::RegisterPrefs(registry); | 390 task_manager::TaskManagerInterface::RegisterPrefs(registry); |
| 391 #endif // defined(ENABLE_TASK_MANAGER) | 391 #endif // !defined(OS_ANDROID) |
| 392 | 392 |
| 393 #if BUILDFLAG(ENABLE_BACKGROUND) | 393 #if BUILDFLAG(ENABLE_BACKGROUND) |
| 394 BackgroundModeManager::RegisterPrefs(registry); | 394 BackgroundModeManager::RegisterPrefs(registry); |
| 395 #endif | 395 #endif |
| 396 | 396 |
| 397 #if !defined(OS_ANDROID) | 397 #if !defined(OS_ANDROID) |
| 398 RegisterBrowserPrefs(registry); | 398 RegisterBrowserPrefs(registry); |
| 399 StartupBrowserCreator::RegisterLocalStatePrefs(registry); | 399 StartupBrowserCreator::RegisterLocalStatePrefs(registry); |
| 400 // The native GCM is used on Android instead. | 400 // The native GCM is used on Android instead. |
| 401 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); | 401 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 // Added 8/2016. | 780 // Added 8/2016. |
| 781 profile_prefs->ClearPref(kStaticEncodings); | 781 profile_prefs->ClearPref(kStaticEncodings); |
| 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); | 782 profile_prefs->ClearPref(kRecentlySelectedEncoding); |
| 783 | 783 |
| 784 // Added 9/2016. | 784 // Added 9/2016. |
| 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 787 } | 787 } |
| 788 | 788 |
| 789 } // namespace chrome | 789 } // namespace chrome |
| OLD | NEW |