diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
| commit | ab34cf48c6364f23214d9242e83eefd174f7f820 (patch) | |
| tree | ce7704d873ee687272322780c46fc9ddee28a619 /www/chromium/files/patch-chrome_browser_flag__descriptions.cc | |
| parent | - Add CONFLICTS for security/snort3 (diff) | |
www/chromium: Update to 71.0.3578.98
Changelog: https://chromium.googlesource.com/chromium/src/+log/68.0.3440.106..71.0.3578.98?pretty=fuller&n=10000
PR: 233990
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reported by: nikolaibitinit@gmail.com
Reviewed by: rene, cpm
Approved by: rene, cpm
MFH: 2019Q1
Security: http://vuxml.freebsd.org/freebsd/546d4dd4-10ea-11e9-b407-080027ef1a23.html
Security: http://vuxml.freebsd.org/freebsd/720590df-10eb-11e9-b407-080027ef1a23.html
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_flag__descriptions.cc | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 7d0d2e62f76c..a2bcb198d861 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2017-12-15 02:04:09.000000000 +0100 -+++ chrome/browser/flag_descriptions.cc 2017-12-24 01:21:43.685723000 +0100 -@@ -2643,7 +2643,7 @@ +--- chrome/browser/flag_descriptions.cc.orig 2018-12-12 22:56:03.000000000 +0100 ++++ chrome/browser/flag_descriptions.cc 2018-12-28 16:55:56.434650000 +0100 +@@ -3555,13 +3555,13 @@ // Random platform combinations ----------------------------------------------- @@ -9,3 +9,26 @@ const char kEnableInputImeApiName[] = "Enable Input IME API"; const char kEnableInputImeApiDescription[] = + "Enable the use of chrome.input.ime API."; + +-#endif // defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_WIN) || defined(OS_MACOSX) + +@@ -3574,13 +3574,13 @@ + + #endif // defined(OS_WIN) || defined(OS_MACOSX) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; + const char kDirectManipulationStylusDescription[] = + "If enabled, Chrome will scroll web pages on stylus drag."; + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const char kExperimentalUiName[] = "Use all upcoming UI features"; + const char kExperimentalUiDescription[] = "Use all upcoming UI features."; |