diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 9f8b6ca5..0ae794bd 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -110,8 +110,7 @@ disable-payment-support-by-default.patch disable-background-sync-by-default.patch disable-sensors-access-site-setting-by-default.patch Disable-media-router-and-remoting-by-default.patch -Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch -Disable-search-ready-omnibox-by-default.patch +Restore-Search-Ready-Omnibox-flag.patch disable-AdsBlockedInfoBar.patch Bromite-AdBlockUpdaterService.patch Add-option-to-configure-the-ad-blocker-filters-URL.patch @@ -141,5 +140,4 @@ Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch Update-i18n-zh_CN-support.patch Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch -Workaround-for-startup-crash.patch Automated-domain-substitution.patch diff --git a/build/patches/Disable-search-ready-omnibox-by-default.patch b/build/patches/Disable-search-ready-omnibox-by-default.patch deleted file mode 100644 index a8fd1932..00000000 --- a/build/patches/Disable-search-ready-omnibox-by-default.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 12 Aug 2019 08:47:04 +0200 -Subject: Disable search-ready omnibox by default - ---- - chrome/browser/flags/android/chrome_feature_list.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -516,7 +516,7 @@ const base::Feature kScrollToExpandPaymentHandler{ - "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kSearchReadyOmniboxFeature{ -- "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "SearchReadyOmnibox", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kServiceManagerForBackgroundPrefetch{ - "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT}; --- -2.17.1 - diff --git a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch similarity index 89% rename from build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch rename to build/patches/Restore-Search-Ready-Omnibox-flag.patch index 6715a7c1..1dbb0b42 100644 --- a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -1,10 +1,13 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 10 Oct 2019 23:30:16 +0200 -Subject: Revert "Cleanup Search Ready Omnibox flag since it has launched" +Subject: Restore Search Ready Omnibox flag +Revert "Cleanup Search Ready Omnibox flag since it has launched" This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2. + +Disable search-ready omnibox by default --- - .../browser/omnibox/suggestions/AutocompleteMediator.java | 6 +++++- + .../browser/omnibox/suggestions/AutocompleteMediator.java | 6 ++++++ chrome/browser/about_flags.cc | 3 +++ chrome/browser/flag-metadata.json | 5 +++++ chrome/browser/flag_descriptions.cc | 5 +++++ @@ -12,25 +15,24 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2. chrome/browser/flags/android/chrome_feature_list.cc | 4 ++++ chrome/browser/flags/android/chrome_feature_list.h | 1 + .../chromium/chrome/browser/flags/ChromeFeatureList.java | 1 + - 8 files changed, 27 insertions(+), 1 deletion(-) + 8 files changed, 28 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -220,8 +220,12 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi +@@ -476,6 +476,12 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi + void onNativeInitialized() { + mNativeInitialized = true; - SuggestionHost host = this::createSuggestionViewDelegate; - -- mEditUrlProcessor = -+ // Do not initialize coordinator if the feature is disabled. ++ // Destroy coordinator if the feature is disabled. + if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) { -+ mEditUrlProcessor = - new EditUrlSuggestionProcessor(mContext, host, mDelegate, iconBridgeSupplier); ++ mEditUrlProcessor.destroy(); ++ mEditUrlProcessor = null; + } + - registerSuggestionProcessor(new AnswerSuggestionProcessor( - mContext, host, mUrlBarEditingTextProvider, imageFetcherSupplier)); - registerSuggestionProcessor( + mEnableAdaptiveSuggestionsCount = + ChromeFeatureList.isEnabled(ChromeFeatureList.OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT); + mEnableDeferredKeyboardPopup = diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -103,7 +105,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kSearchReadyOmniboxFeature{ -+ "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT}; ++ "SearchReadyOmnibox", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kServiceManagerForBackgroundPrefetch{ "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};