fix 789

Disable search-ready omnibox by default

---

 .../suggestions/DropdownItemViewInfoListBuilder.java     | 9 +++++++--

 .../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/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, 29 insertions(+), 2 deletions(-)

 8 files changed, 27 insertions(+), 3 deletions(-)

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;

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 {

     DropdownItemViewInfoListBuilder() {

         mPriorityOrderedSuggestionProcessors = new ArrayList<>();

@@ -90,8 +91,8 @@ class DropdownItemViewInfoListBuilder {

                 () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get();

         mLastProcessedSuggestionURL = suggestion.getUrl();

         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(

                 new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier));

         registerSuggestionProcessor(

@@ -219,6 +220,10 @@ class DropdownItemViewInfoListBuilder {

     /** Signals that native initialization has completed. */

     void onNativeInitialized() {

+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) {

+             registerSuggestionProcessor(mEditUrlSuggestionProcessor);

-        if (!mHasClearedOmniboxForFocus) {

-            mHasClearedOmniboxForFocus = true;

-            mUrlBarDelegate.setOmniboxEditingText("");

+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX) == false) {

+            if (!mHasClearedOmniboxForFocus) {

+                mHasClearedOmniboxForFocus = true;

+                mUrlBarDelegate.setOmniboxEditingText("");

+            }

+

         mEnableAdaptiveSuggestionsCount =

                 ChromeFeatureList.isEnabled(ChromeFeatureList.OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT);

         }

         return true;

     }

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

     public static final String OMNIBOX_COMPACT_SUGGESTIONS = "OmniboxCompactSuggestions";

     public static final String OMNIBOX_DEFERRED_KEYBOARD_POPUP = "OmniboxDeferredKeyboardPopup";

     public static final String OMNIBOX_ENABLE_CLIPBOARD_PROVIDER_IMAGE_SUGGESTIONS =

-- 

2.17.1