| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 #endif | 232 #endif |
| 233 | 233 |
| 234 #if defined(OS_MACOSX) | 234 #if defined(OS_MACOSX) |
| 235 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 235 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 236 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 236 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 237 #endif | 237 #endif |
| 238 | 238 |
| 239 #if defined(OS_WIN) | 239 #if defined(OS_WIN) |
| 240 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 240 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 241 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 241 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 242 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom
pt_prefs_manager.h" |
| 242 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" | 243 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" |
| 243 #endif | 244 #endif |
| 244 | 245 |
| 245 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 246 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 246 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 247 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 247 #endif | 248 #endif |
| 248 | 249 |
| 249 #if defined(TOOLKIT_VIEWS) | 250 #if defined(TOOLKIT_VIEWS) |
| 250 #include "chrome/browser/ui/browser_view_prefs.h" | 251 #include "chrome/browser/ui/browser_view_prefs.h" |
| 251 #endif | 252 #endif |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 #endif | 595 #endif |
| 595 | 596 |
| 596 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 597 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
| 597 ArcAppListPrefs::RegisterProfilePrefs(registry); | 598 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 598 #endif | 599 #endif |
| 599 | 600 |
| 600 #if defined(OS_WIN) | 601 #if defined(OS_WIN) |
| 601 component_updater::RegisterProfilePrefsForSwReporter(registry); | 602 component_updater::RegisterProfilePrefsForSwReporter(registry); |
| 602 desktop_ios_promotion::RegisterProfilePrefs(registry); | 603 desktop_ios_promotion::RegisterProfilePrefs(registry); |
| 603 NetworkProfileBubble::RegisterProfilePrefs(registry); | 604 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 605 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs( |
| 606 registry); |
| 604 #endif | 607 #endif |
| 605 | 608 |
| 606 #if defined(TOOLKIT_VIEWS) | 609 #if defined(TOOLKIT_VIEWS) |
| 607 RegisterBrowserViewProfilePrefs(registry); | 610 RegisterBrowserViewProfilePrefs(registry); |
| 608 RegisterInvertBubbleUserPrefs(registry); | 611 RegisterInvertBubbleUserPrefs(registry); |
| 609 #endif | 612 #endif |
| 610 | 613 |
| 611 #if defined(USE_ASH) | 614 #if defined(USE_ASH) |
| 612 ash::launcher::RegisterChromeLauncherUserPrefs(registry); | 615 ash::launcher::RegisterChromeLauncherUserPrefs(registry); |
| 613 #endif | 616 #endif |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); | 730 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); |
| 728 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); | 731 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); |
| 729 | 732 |
| 730 #if BUILDFLAG(ENABLE_EXTENSIONS) | 733 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 731 // Added 2/2017. | 734 // Added 2/2017. |
| 732 profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus); | 735 profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus); |
| 733 #endif | 736 #endif |
| 734 } | 737 } |
| 735 | 738 |
| 736 } // namespace chrome | 739 } // namespace chrome |
| OLD | NEW |