121 lines
6.8 KiB
Diff
121 lines
6.8 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Thu, 10 Oct 2019 23:30:16 +0200
|
|
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
|
|
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
chrome/browser/flags/android/chrome_feature_list.cc | 1 +
|
|
.../chrome/browser/flags/ChromeFeatureList.java | 1 +
|
|
.../DropdownItemViewInfoListBuilder.java | 11 +++++++++--
|
|
.../restore-Search-Ready-Omnibox-flag.inc | 13 +++++++++++++
|
|
.../restore-Search-Ready-Omnibox-flag.inc | 3 +++
|
|
.../restore-Search-Ready-Omnibox-flag.inc | 1 +
|
|
6 files changed, 28 insertions(+), 2 deletions(-)
|
|
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc
|
|
|
|
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
|
|
@@ -256,6 +256,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
|
|
&kReaderModeInCCT,
|
|
&kRecordSuppressionMetrics,
|
|
&kReengagementNotification,
|
|
+ &kSearchReadyOmniboxFeature,
|
|
&kRelatedSearchesAllLanguage,
|
|
&kReportParentalControlSitesChild,
|
|
&kSearchEnginesPromoV3,
|
|
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
@@ -329,6 +329,7 @@ public abstract class ChromeFeatureList {
|
|
"LookalikeUrlNavigationSuggestionsUI";
|
|
public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid";
|
|
public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked";
|
|
+ public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
|
|
public static final String MIGRATE_ACCOUNT_MANAGEMENT_SETTINGS_TO_CAPABILITIES =
|
|
"MigrateAccountManagementSettingsToCapabilities";
|
|
public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP =
|
|
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
|
|
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
|
|
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
|
|
@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
|
|
import androidx.annotation.Px;
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
|
|
import org.chromium.base.supplier.Supplier;
|
|
import org.chromium.chrome.browser.flags.ChromeFeatureList;
|
|
import org.chromium.chrome.browser.omnibox.OmniboxFeatures;
|
|
@@ -55,6 +56,7 @@ class DropdownItemViewInfoListBuilder {
|
|
private @NonNull BookmarkState mBookmarkState;
|
|
private @Px int mDropdownHeight;
|
|
private boolean mUseNativeGrouping;
|
|
+ private EditUrlSuggestionProcessor mEditUrlSuggestionProcessor;
|
|
|
|
DropdownItemViewInfoListBuilder(
|
|
@NonNull Supplier<Tab> tabSupplier, @NonNull BookmarkState bookmarkState) {
|
|
@@ -88,9 +90,11 @@ class DropdownItemViewInfoListBuilder {
|
|
|
|
mGroupSeparatorProcessor = new GroupSeparatorProcessor(context);
|
|
mHeaderProcessor = new HeaderProcessor(context);
|
|
- registerSuggestionProcessor(
|
|
+ mEditUrlSuggestionProcessor =
|
|
new EditUrlSuggestionProcessor(
|
|
- context, host, mImageSupplier, mActivityTabSupplier, shareSupplier));
|
|
+ context, host, mImageSupplier, mActivityTabSupplier, shareSupplier);
|
|
+ registerSuggestionProcessor(mEditUrlSuggestionProcessor);
|
|
+
|
|
registerSuggestionProcessor(
|
|
new AnswerSuggestionProcessor(context, host, textProvider, mImageSupplier));
|
|
registerSuggestionProcessor(
|
|
@@ -200,6 +204,9 @@ class DropdownItemViewInfoListBuilder {
|
|
mUseNativeGrouping =
|
|
ChromeFeatureList.isEnabled(
|
|
ChromeFeatureList.OMNIBOX_SUGGESTION_GROUPING_FOR_NON_ZPS);
|
|
+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX) == false) {
|
|
+ mPriorityOrderedSuggestionProcessors.remove(mEditUrlSuggestionProcessor);
|
|
+ }
|
|
for (int index = 0; index < mPriorityOrderedSuggestionProcessors.size(); index++) {
|
|
mPriorityOrderedSuggestionProcessors.get(index).onNativeInitialized();
|
|
}
|
|
diff --git a/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
@@ -0,0 +1,13 @@
|
|
+#if BUILDFLAG(IS_ANDROID)
|
|
+
|
|
+#ifdef FLAG_SECTION
|
|
+
|
|
+ {"enable-search-ready-omnibox",
|
|
+ "Search Ready Omnibox",
|
|
+ "Clears the omnibox and adds a suggestion item to share, copy, or edit the "
|
|
+ "URL.", kOsAndroid,
|
|
+ FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
|
|
+
|
|
+#endif
|
|
+
|
|
+#endif
|
|
diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
|
|
@@ -0,0 +1,3 @@
|
|
+CROMITE_FEATURE(kSearchReadyOmniboxFeature,
|
|
+ "SearchReadyOmnibox",
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT);
|
|
diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc
|
|
@@ -0,0 +1 @@
|
|
+BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature);
|
|
--
|