diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
| commit | d90bf58cf83c548d4ed98f8c6ee55a6b84af0834 (patch) | |
| tree | e364221b071fc7af079027aa7e6ac3d25435767a /www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc | |
| parent | Update CMake to latest release, 3.14.1 (diff) | |
www/chromium: Update to 73.0.3683.86
- 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
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index dcb18adbafc1..99cc2097f2df 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-02-06 22:29:40.393569000 +0100 -+++ chrome/browser/prefs/browser_prefs.cc 2019-02-06 22:30:41.131808000 +0100 -@@ -313,7 +313,7 @@ +--- 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 @@ -9,12 +9,12 @@ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -764,7 +764,7 @@ +@@ -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::prefs::RegisterProfilePrefs(registry); + browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif |