summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_flag__descriptions.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.h')
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h32
1 files changed, 22 insertions, 10 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index ad0807412561..9f158272b478 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,20 +1,32 @@
---- chrome/browser/flag_descriptions.h.orig 2017-06-05 19:03:02 UTC
-+++ chrome/browser/flag_descriptions.h
-@@ -1754,7 +1754,7 @@ extern const char kForceUiDirectionLtr[];
- // Name for the option to force right-to-left UI direction mode.
- extern const char kForceUiDirectionRtl[];
+--- chrome/browser/flag_descriptions.h.orig 2018-12-12 22:56:03.000000000 +0100
++++ chrome/browser/flag_descriptions.h 2018-12-28 16:55:56.425688000 +0100
+@@ -2167,12 +2167,12 @@
+
+ // Random platform combinations -----------------------------------------------
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Name of the flag to enable che chrome.input.ime API.
extern const char kEnableInputImeApiName[];
-@@ -1762,7 +1762,7 @@ extern const char kEnableInputImeApiName[];
- // Description of the flag to enable the chrome.input.ime API.
extern const char kEnableInputImeApiDescription[];
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Enables grouping websites by domain on chrome://history.
- extern const char kEnableGroupedHistoryName[];
+ extern const char kExperimentalUiName[];
+ extern const char kExperimentalUiDescription[];
+@@ -2184,12 +2184,12 @@
+
+ #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)
+
+ extern const char kDirectManipulationStylusName[];
+ extern const char kDirectManipulationStylusDescription[];
+
+-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+
+ // Feature flags --------------------------------------------------------------
+