From 525889600fe66538e8d498ce02bdd74082017b89 Mon Sep 17 00:00:00 2001
From: Carmelo Messina <carmelo.messina@uazo.it>
Date: Fri, 6 Nov 2020 21:49:09 +0100
Subject: [PATCH] restore search ready omnibox flags behaviour

---
 .../Restore-Search-Ready-Omnibox-flag.patch   | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
index a826cf5d..6e933e2a 100644
--- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch
+++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch
@@ -7,34 +7,50 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
 
 Disable search-ready omnibox by default
 ---
- .../suggestions/editurl/EditUrlSuggestionProcessor.java   | 8 +++++---
- chrome/browser/about_flags.cc                             | 3 +++
- chrome/browser/flag-metadata.json                         | 5 +++++
- chrome/browser/flag_descriptions.cc                       | 5 +++++
- chrome/browser/flag_descriptions.h                        | 3 +++
- 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(+), 3 deletions(-)
+ .../suggestions/DropdownItemViewInfoListBuilder.java   | 10 ++++++++--
+ chrome/browser/about_flags.cc                          |  3 +++
+ chrome/browser/flag-metadata.json                      |  5 +++++
+ chrome/browser/flag_descriptions.cc                    |  5 +++++
+ chrome/browser/flag_descriptions.h                     |  3 +++
+ chrome/browser/flags/android/chrome_feature_list.cc    |  4 ++++
+ chrome/browser/flags/android/chrome_feature_list.h     |  1 +
+ .../chrome/browser/flags/ChromeFeatureList.java        |  1 +
+ 8 files changed, 30 insertions(+), 2 deletions(-)
 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java
-@@ -95,9 +95,11 @@ public class EditUrlSuggestionProcessor extends BaseSuggestionViewProcessor {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
+@@ -62,6 +62,7 @@ class DropdownItemViewInfoListBuilder {
+     private int mDropdownHeight;
+     private boolean mEnableAdaptiveSuggestionsCount;
+     private boolean mBuiltListHasFullyConcealedElements;
++    private EditUrlSuggestionProcessor mEditUrlSuggestionProcessor;
  
-         mLastProcessedSuggestionURL = suggestion.getUrl();
+     DropdownItemViewInfoListBuilder() {
+         mPriorityOrderedSuggestionProcessors = new ArrayList<>();
+@@ -90,8 +91,9 @@ class DropdownItemViewInfoListBuilder {
+                 () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get();
  
--        if (!mHasClearedOmniboxForFocus) {
--            mHasClearedOmniboxForFocus = true;
--            mUrlBarDelegate.setOmniboxEditingText("");
+         mHeaderProcessor = new HeaderProcessor(context, host, delegate);
+-        registerSuggestionProcessor(new EditUrlSuggestionProcessor(
+-                context, host, delegate, iconBridgeSupplier, tabSupplier, shareSupplier));
++        mEditUrlSuggestionProcessor = new EditUrlSuggestionProcessor(
++                context, host, delegate, iconBridgeSupplier, tabSupplier, shareSupplier);
++        registerSuggestionProcessor(mEditUrlSuggestionProcessor);
+         registerSuggestionProcessor(
+                 new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier));
+         registerSuggestionProcessor(
+@@ -219,6 +221,10 @@ class DropdownItemViewInfoListBuilder {
+ 
+     /** Signals that native initialization has completed. */
+     void onNativeInitialized() {
 +        if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX) == false) {
-+            if (!mHasClearedOmniboxForFocus) {
-+                mHasClearedOmniboxForFocus = true;
-+                mUrlBarDelegate.setOmniboxEditingText("");
-+            }
-         }
-         return true;
-     }
++            mPriorityOrderedSuggestionProcessors.remove(mEditUrlSuggestionProcessor);
++        }
++
+         mEnableAdaptiveSuggestionsCount =
+                 ChromeFeatureList.isEnabled(ChromeFeatureList.OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT);
+ 
 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