mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
20 lines
898 B
C++
20 lines
898 B
C++
--- chrome/browser/prefs/browser_prefs.cc.orig 2019-03-11 22:00:53 UTC
|
|
+++ chrome/browser/prefs/browser_prefs.cc
|
|
@@ -319,7 +319,7 @@
|
|
#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h"
|
|
#endif
|
|
|
|
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
|
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
|
|
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
|
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
|
|
#endif
|
|
@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
|
|
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
|
|
#endif
|
|
|
|
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
|
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
|
|
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
|
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
|
|
#endif
|