0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #796 from uazo/fix-789

Browse source 
Fix Omnibox flag not working
This commit is contained in:
Carl 2020-11-07 21:29:06 +01:00 • committed by GitHub
commit a3d4ff7371
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/patches/Restore-Search-Ready-Omnibox-flag.patch
View file

@ -7,15 +7,15 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
Disable search-ready omnibox by default
---
.../suggestions/DropdownItemViewInfoListBuilder.java | 9 +++++++--
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, 29 insertions(+), 2 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/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
@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
DropdownItemViewInfoListBuilder() {
mPriorityOrderedSuggestionProcessors = new ArrayList<>();
@@ -90,8 +91,8 @@ class DropdownItemViewInfoListBuilder {
@@ -90,8 +91,9 @@ class DropdownItemViewInfoListBuilder {
() -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get();
mHeaderProcessor = new HeaderProcessor(context, host, delegate);
@ -36,15 +36,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
- 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 +220,10 @@ class DropdownItemViewInfoListBuilder {
@@ -219,6 +221,10 @@ class DropdownItemViewInfoListBuilder {
/** Signals that native initialization has completed. */
void onNativeInitialized() {
+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) {
+ registerSuggestionProcessor(mEditUrlSuggestionProcessor);
+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX) == false) {
+ mPriorityOrderedSuggestionProcessors.remove(mEditUrlSuggestionProcessor);
+ }
+
mEnableAdaptiveSuggestionsCount =
@ -149,6 +150,3 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
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