diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_about__flags.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_about__flags.cc | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 13cdee68690f..33681069d558 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,15 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/about_flags.cc 2018-07-20 16:41:11.196156000 +0200 -@@ -593,7 +593,7 @@ - switches::kForceDirectionRTL}, - }; - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - // Feature used to enable the identification of open tabs given URLs in - // suggestions, and converting those suggestions to ones that allow switching to - // the tab if found. Currently only on the desktop. Includes button option -@@ -2441,12 +2441,12 @@ +--- chrome/browser/about_flags.cc.orig 2018-08-01 00:08:29.000000000 +0200 ++++ chrome/browser/about_flags.cc 2018-08-04 14:12:27.193526000 +0200 +@@ -2408,7 +2408,7 @@ flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS @@ -18,27 +9,12 @@ {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-origin-trials", flag_descriptions::kOriginTrialsName, - flag_descriptions::kOriginTrialsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -3058,7 +3058,7 @@ +@@ -3024,7 +3024,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-entity-suggestions", - flag_descriptions::kOmniboxEntitySuggestionsName, - flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, -@@ -3077,7 +3077,7 @@ - {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, - flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - #if defined(OS_ANDROID) - {"enable-custom-feedback-ui", + {"omnibox-new-answer-layout", + flag_descriptions::kOmniboxNewAnswerLayoutName, + flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop, |