1722 lines
101 KiB
Diff
1722 lines
101 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||
Date: Wed, 9 Mar 2022 19:22:02 +0100
|
||
Subject: Remove contextual search manager
|
||
|
||
---
|
||
chrome/BUILD.gn | 10 --
|
||
chrome/android/BUILD.gn | 9 --
|
||
chrome/android/chrome_java_resources.gni | 17 ----
|
||
chrome/android/chrome_java_sources.gni | 61 -------------
|
||
.../ManualFillingMediator.java | 9 --
|
||
.../contextual_search_promo_ripple.9.png | Bin 411 -> 0 bytes
|
||
.../contextual_search_promo_ripple.9.png | Bin 304 -> 0 bytes
|
||
.../contextual_search_promo_ripple.9.png | Bin 522 -> 0 bytes
|
||
.../contextual_search_promo_ripple.9.png | Bin 665 -> 0 bytes
|
||
.../contextual_search_promo_ripple.9.png | Bin 983 -> 0 bytes
|
||
...contextual_search_bar_banner_text_view.xml | 24 -----
|
||
.../layout/contextual_search_caption_view.xml | 14 ---
|
||
.../contextual_search_card_icon_view.xml | 12 ---
|
||
.../layout/contextual_search_context_view.xml | 25 -----
|
||
.../layout/contextual_search_promo_view.xml | 66 --------------
|
||
.../contextual_search_promo_view_revised.xml | 86 ------------------
|
||
...ntextual_search_quick_action_icon_view.xml | 12 ---
|
||
...earch_related_searches_in_content_view.xml | 16 ----
|
||
...ontextual_search_related_searches_view.xml | 21 -----
|
||
.../layout/contextual_search_term_view.xml | 19 ----
|
||
.../res/xml/contextual_search_preferences.xml | 25 -----
|
||
.../xml/contextual_search_tap_preferences.xml | 26 ------
|
||
.../res/xml/google_services_preferences.xml | 4 -
|
||
.../java/res/xml/privacy_preferences.xml | 4 -
|
||
.../chrome/browser/ChromeTabbedActivity.java | 4 +-
|
||
.../chrome/browser/app/ChromeActivity.java | 50 +---------
|
||
.../bottombar/OverlayPanelContent.java | 1 -
|
||
.../compositor/layouts/LayoutManagerImpl.java | 4 +-
|
||
.../customtabs/BaseCustomTabActivity.java | 2 +-
|
||
.../BaseCustomTabRootUiCoordinator.java | 5 +-
|
||
.../browser/customtabs/CustomTabActivity.java | 6 --
|
||
.../modaldialog/ChromeTabModalPresenter.java | 12 +--
|
||
.../modaldialog/TabModalLifetimeHandler.java | 7 +-
|
||
.../privacy/settings/PrivacySettings.java | 9 --
|
||
.../chrome/browser/tab/TabHelpers.java | 2 -
|
||
.../tabbed_mode/TabbedRootUiCoordinator.java | 5 +-
|
||
.../chrome/browser/ui/RootUiCoordinator.java | 60 +-----------
|
||
chrome/browser/BUILD.gn | 31 -------
|
||
chrome/browser/about_flags.cc | 76 ----------------
|
||
...nfiguration_policy_handler_list_factory.cc | 6 +-
|
||
.../strings/android_chrome_strings.grd | 78 ----------------
|
||
components/BUILD.gn | 1 -
|
||
content/browser/browser_interface_binders.cc | 1 -
|
||
third_party/blink/public/mojom/BUILD.gn | 2 +-
|
||
third_party/blink/public/public_features.gni | 2 +-
|
||
45 files changed, 17 insertions(+), 807 deletions(-)
|
||
delete mode 100644 chrome/android/java/res/drawable-hdpi/contextual_search_promo_ripple.9.png
|
||
delete mode 100644 chrome/android/java/res/drawable-mdpi/contextual_search_promo_ripple.9.png
|
||
delete mode 100644 chrome/android/java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png
|
||
delete mode 100644 chrome/android/java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png
|
||
delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_bar_banner_text_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_caption_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_card_icon_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_context_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_promo_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_promo_view_revised.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_related_searches_view.xml
|
||
delete mode 100644 chrome/android/java/res/layout/contextual_search_term_view.xml
|
||
delete mode 100644 chrome/android/java/res/xml/contextual_search_preferences.xml
|
||
delete mode 100644 chrome/android/java/res/xml/contextual_search_tap_preferences.xml
|
||
|
||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||
--- a/chrome/BUILD.gn
|
||
+++ b/chrome/BUILD.gn
|
||
@@ -1584,20 +1584,10 @@ group("strings") {
|
||
}
|
||
|
||
if (is_android) {
|
||
- java_cpp_enum("assist_ranker_prediction_enum_javagen") {
|
||
- sources = [
|
||
- "browser/android/contextualsearch/contextual_search_ranker_logger_impl.h",
|
||
- ]
|
||
- }
|
||
-
|
||
java_cpp_enum("partner_bookmarks_javagen") {
|
||
sources = [ "browser/android/bookmarks/partner_bookmarks_reader.h" ]
|
||
}
|
||
|
||
- java_cpp_enum("quick_action_category_enum_javagen") {
|
||
- sources = [ "browser/android/contextualsearch/resolved_search_term.h" ]
|
||
- }
|
||
-
|
||
java_cpp_enum("offline_pages_enum_javagen") {
|
||
sources = [ "browser/offline_pages/offline_page_utils.h" ]
|
||
}
|
||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||
--- a/chrome/android/BUILD.gn
|
||
+++ b/chrome/android/BUILD.gn
|
||
@@ -488,7 +488,6 @@ android_library("chrome_java") {
|
||
"//components/content_capture/android:java",
|
||
"//components/content_settings/android:content_settings_enums_java",
|
||
"//components/content_settings/android:java",
|
||
- "//components/contextual_search/content/common/mojom:mojom_java",
|
||
"//components/crash/android:java",
|
||
"//components/dom_distiller/content/browser/android:dom_distiller_content_java",
|
||
"//components/dom_distiller/core/android:dom_distiller_core_java",
|
||
@@ -656,11 +655,9 @@ android_library("chrome_java") {
|
||
":chrome_strict_mode_switch",
|
||
":resource_id_javagen",
|
||
":vr_build_config",
|
||
- "//chrome:assist_ranker_prediction_enum_javagen",
|
||
"//chrome:instant_apps_reasons_enum_javagen",
|
||
"//chrome:offline_pages_enum_javagen",
|
||
"//chrome:partner_bookmarks_javagen",
|
||
- "//chrome:quick_action_category_enum_javagen",
|
||
"//chrome:supervised_user_url_filter_enum_javagen",
|
||
"//chrome/browser:screenshot_mode_enum",
|
||
"//chrome/browser:sharing_dialog_type_generated_enum",
|
||
@@ -3829,18 +3826,12 @@ generate_jni("chrome_jni_headers") {
|
||
"java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSwipeSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/content/ContentUtils.java",
|
||
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/CtrSuppression.java",
|
||
"java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java",
|
||
"java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",
|
||
"java/src/org/chromium/chrome/browser/datareduction/DataSaverOSSetting.java",
|
||
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
|
||
--- a/chrome/android/chrome_java_resources.gni
|
||
+++ b/chrome/android/chrome_java_resources.gni
|
||
@@ -31,7 +31,6 @@ chrome_java_resources = [
|
||
"java/res/drawable-hdpi/btn_tab_close_normal.png",
|
||
"java/res/drawable-hdpi/btn_tabstrip_new_tab.png",
|
||
"java/res/drawable-hdpi/btn_tabstrip_switch_normal.png",
|
||
- "java/res/drawable-hdpi/contextual_search_promo_ripple.9.png",
|
||
"java/res/drawable-hdpi/cvc_icon.png",
|
||
"java/res/drawable-hdpi/cvc_icon_amex.png",
|
||
"java/res/drawable-hdpi/down_arrow.png",
|
||
@@ -106,7 +105,6 @@ chrome_java_resources = [
|
||
"java/res/drawable-mdpi/btn_tab_close_normal.png",
|
||
"java/res/drawable-mdpi/btn_tabstrip_new_tab.png",
|
||
"java/res/drawable-mdpi/btn_tabstrip_switch_normal.png",
|
||
- "java/res/drawable-mdpi/contextual_search_promo_ripple.9.png",
|
||
"java/res/drawable-mdpi/cvc_icon.png",
|
||
"java/res/drawable-mdpi/cvc_icon_amex.png",
|
||
"java/res/drawable-mdpi/down_arrow.png",
|
||
@@ -190,7 +188,6 @@ chrome_java_resources = [
|
||
"java/res/drawable-xhdpi/btn_tab_close_normal.png",
|
||
"java/res/drawable-xhdpi/btn_tabstrip_new_tab.png",
|
||
"java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png",
|
||
- "java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png",
|
||
"java/res/drawable-xhdpi/cvc_icon.png",
|
||
"java/res/drawable-xhdpi/cvc_icon_amex.png",
|
||
"java/res/drawable-xhdpi/down_arrow.png",
|
||
@@ -259,7 +256,6 @@ chrome_java_resources = [
|
||
"java/res/drawable-xxhdpi/btn_tab_close_normal.png",
|
||
"java/res/drawable-xxhdpi/btn_tabstrip_new_tab.png",
|
||
"java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png",
|
||
- "java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png",
|
||
"java/res/drawable-xxhdpi/cvc_icon.png",
|
||
"java/res/drawable-xxhdpi/cvc_icon_amex.png",
|
||
"java/res/drawable-xxhdpi/down_arrow.png",
|
||
@@ -328,7 +324,6 @@ chrome_java_resources = [
|
||
"java/res/drawable-xxxhdpi/btn_tab_close_normal.png",
|
||
"java/res/drawable-xxxhdpi/btn_tabstrip_new_tab.png",
|
||
"java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png",
|
||
- "java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png",
|
||
"java/res/drawable-xxxhdpi/cvc_icon.png",
|
||
"java/res/drawable-xxxhdpi/cvc_icon_amex.png",
|
||
"java/res/drawable-xxxhdpi/down_arrow.png",
|
||
@@ -519,16 +514,6 @@ chrome_java_resources = [
|
||
"java/res/layout/context_menu_header.xml",
|
||
"java/res/layout/context_menu_row.xml",
|
||
"java/res/layout/context_menu_share_row.xml",
|
||
- "java/res/layout/contextual_search_bar_banner_text_view.xml",
|
||
- "java/res/layout/contextual_search_caption_view.xml",
|
||
- "java/res/layout/contextual_search_card_icon_view.xml",
|
||
- "java/res/layout/contextual_search_context_view.xml",
|
||
- "java/res/layout/contextual_search_promo_view.xml",
|
||
- "java/res/layout/contextual_search_promo_view_revised.xml",
|
||
- "java/res/layout/contextual_search_quick_action_icon_view.xml",
|
||
- "java/res/layout/contextual_search_related_searches_in_content_view.xml",
|
||
- "java/res/layout/contextual_search_related_searches_view.xml",
|
||
- "java/res/layout/contextual_search_term_view.xml",
|
||
"java/res/layout/custom_tabs_bottombar.xml",
|
||
"java/res/layout/custom_tabs_bottombar_item.xml",
|
||
"java/res/layout/custom_tabs_control_container.xml",
|
||
@@ -685,8 +670,6 @@ chrome_java_resources = [
|
||
"java/res/xml/autofill_assistant_preferences.xml",
|
||
"java/res/xml/bookmark_widget_info.xml",
|
||
"java/res/xml/clear_browsing_data_preferences_tab.xml",
|
||
- "java/res/xml/contextual_search_preferences.xml",
|
||
- "java/res/xml/contextual_search_tap_preferences.xml",
|
||
"java/res/xml/developer_preferences.xml",
|
||
"java/res/xml/do_not_track_preferences.xml",
|
||
"java/res/xml/google_services_preferences.xml",
|
||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||
--- a/chrome/android/chrome_java_sources.gni
|
||
+++ b/chrome/android/chrome_java_sources.gni
|
||
@@ -305,22 +305,6 @@ chrome_java_sources = [
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarBannerControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCardIconControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchContextControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchImageControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelCoordinator.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelInterface.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelMetrics.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPromoControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchQuickActionControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchSheetContent.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchTermControl.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/NoSystemGestureFrameLayout.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/RelatedSearchesControl.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
|
||
@@ -362,7 +346,6 @@ chrome_java_sources = [
|
||
"java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripStacker.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
|
||
- "java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
|
||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
|
||
@@ -388,50 +371,6 @@ chrome_java_sources = [
|
||
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
|
||
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
|
||
"java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/BarOverlapTapSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEntityHeuristic.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchHeuristic.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchHeuristics.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInteractionPersister.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInteractionPersisterImpl.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInteractionRecorder.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateController.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateHandler.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequest.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapState.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTranslation.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTranslationImpl.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/CtrSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/DisableablePromoTapCounter.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/EngagementSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/NearTopTapSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/QuickAnswersHeuristic.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/RecentScrollTapSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/RelatedSearchesList.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/RelatedSearchesStamp.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/RelatedSearchesUma.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ResolvedSearchTerm.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/ShortTextRunSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/SmallTextSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/TapDurationSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/TapFarFromPreviousSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/TapWordEdgeSuppression.java",
|
||
- "java/src/org/chromium/chrome/browser/contextualsearch/TapWordLengthSuppression.java",
|
||
"java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploadJobServiceImpl.java",
|
||
"java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java",
|
||
"java/src/org/chromium/chrome/browser/crash/ChromePureJavaExceptionReporter.java",
|
||
diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
|
||
--- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
|
||
+++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
|
||
@@ -33,7 +33,6 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
|
||
import org.chromium.base.supplier.Supplier;
|
||
import org.chromium.chrome.browser.app.ChromeActivity;
|
||
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.flags.ChromeFeatureList;
|
||
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
|
||
import org.chromium.chrome.browser.fullscreen.FullscreenOptions;
|
||
@@ -486,14 +485,6 @@ class ManualFillingMediator extends EmptyTabObserver
|
||
// When in VR mode, don't extend the keyboard
|
||
if (VrModuleProvider.getDelegate().isInVr()) return false;
|
||
|
||
- // Don't open the accessory inside the contextual search panel.
|
||
- ObservableSupplier<ContextualSearchManager> contextualSearchSupplier =
|
||
- mActivity.getContextualSearchManagerSupplier();
|
||
- if (contextualSearchSupplier != null && contextualSearchSupplier.hasValue()
|
||
- && contextualSearchSupplier.get().isSearchPanelOpened()) {
|
||
- return false;
|
||
- }
|
||
-
|
||
// If an accessory sheet was opened, the accessory bar must be visible.
|
||
if (mAccessorySheet.isShown()) return true;
|
||
|
||
diff --git a/chrome/android/java/res/drawable-hdpi/contextual_search_promo_ripple.9.png b/chrome/android/java/res/drawable-hdpi/contextual_search_promo_ripple.9.png
|
||
deleted file mode 100644
|
||
index 1ee4b452fc45a98175001972d234a2b7d34cb9f2..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 411
|
||
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000O8002q|1^@s6hMyJe0004ENkl<Zcmajd
|
||
zy=v4^6h-m1@64!$HW9@}1I9u~A+fO$9P$u8&mY96@d>PEw6M}NVj*ZFf|6JS72-#{
|
||
z+a}ZH?sMuNYd43pGlOe@_n-b`|H<*r2msJ&%LrN{1G_znK;q`Z>G<{#04x@5838VU
|
||
z<OfATcb3!P<uMRV?b5w503_Xyz|vj>Kmo+=?)2`$5C|4qY~M{2w0Yl&U`ERTTmZ2F
|
||
z9u&w0Tep_eY7Q_z4@k^4+uI%#HkEcG192^aMh103C<9j$pbD@Rf$+r$5E<CY04RW*
|
||
zfyxO{03ZYNI|KYH0;8fJ3SeiTs$g_dOz<rN!BGTu0VED1==5Sj&IQ@I@aJ^)X$Xve
|
||
zyqd0r3G3r#>0BWBL;R?2Wq^AIstWEW?}xzV%X+&0H5Cp30`Qv(<bqHCjtj;|>*?y}
|
||
zA&~VNAQbvKg5JFv1N-}nx6cnkK`(js_}>s1R)jNy`wu}Rfpyx<7RCSo002ovPDHLk
|
||
FV1gC|uc`n5
|
||
|
||
diff --git a/chrome/android/java/res/drawable-mdpi/contextual_search_promo_ripple.9.png b/chrome/android/java/res/drawable-mdpi/contextual_search_promo_ripple.9.png
|
||
deleted file mode 100644
|
||
index 719e093c28bc22c3956cb936635ae535b4e98087..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 304
|
||
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq000I6001%w1^@s6e<!N*0002@Nkl<ZcwTkX
|
||
zKQF^!0L1a{{i-yvh>$RdL=%&RO-R(6@M;Vlyc_SpLJVvMi-klaNZQH2LAB0e>T}Pn
|
||
zpWKbde@uuEPd;CmN&_IVy5E1_EC8V0Rxbi@kipuEAhEvNe_Kpbbky38z|8MX1}irN
|
||
zTM>{pGQfPVKUhhCnobvR0kqtW4b!YeXka;lYoHp~%79qNVCEtSXE4l0K*|l7Rs@Uh
|
||
z2-q1^ZJ_GZR|LZ_0yR(#41*fHW|-(9Lo>by)J)C%T;85N6%E;soE}XIu($�d6wb
|
||
z8Agl(*n{iirRNgF6+i(t=MlzZU4&cu7y=^1Oyv*gkyV!1(<zhy0000<MNUMnLSTZ%
|
||
CeSN6_
|
||
|
||
diff --git a/chrome/android/java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png b/chrome/android/java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png
|
||
deleted file mode 100644
|
||
index 43e830e8e3b8a2d30601474de77d05b8039583c6..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 522
|
||
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000UA003eL1^@s6X_Z2X00001b5ch_0Itp)
|
||
z=>Px$#7RU!RCr#k*Rg7oaTta1=Y07vOC3rKE-FZLX%)0ODb=)_7vN=xn~M%Xba8d_
|
||
z62yBDgenp2u0{tHF|965wGC-<T)zE(hQ9NU^UN>JnZi|oH=pja@nrI<1e@bFpdyrX
|
||
zsy~>lCW}zhkDv%4;ufG_QQeKlla(R_u;@onVm*S0YZ*knn-6wRmeZhmseL6_1gTmJ
|
||
zAy-4_4BA?`aPM<FN!MpicQ2P<gIjA61TJOJ>SYjTQ0P2^K~;o^6Pxw@vq2hg-OC_u
|
||
zATGcvT&x^ID}?g7ba9!xFI&MP)s59VoiYU472OD0A*@npjyo+v2>If21Z~<8L<(WL
|
||
zD4eEA)5@TaJ*_ki)M<K_L3<iOiwuHN=)(*;Oe;>y8FZf3L6~0r$<nZ!rOi$R7fu(`
|
||
zwB;;a+1cXX`8<Nt;h?jZz%f7(+Ws0r(3c2`#VCRctAVHhkFxZ9|0qb?J6q4XlQI-d
|
||
zwg7F7GAMt{AdBq?9@2{7&*8(RaT%IstpJTPNDAl7%Fy=jH;+2sgGFtJkB{F*urjZU
|
||
z&~Wf={A*Z**zZQqFHVb4G}&T$;Q*R{dp|zCFGG3j!;9-P3g;5|4-Go2?Ilftga7~l
|
||
M07*qoM6N<$g7Y)yrvLx|
|
||
|
||
diff --git a/chrome/android/java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png b/chrome/android/java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png
|
||
deleted file mode 100644
|
||
index 83dcfafb0da753bf1369fbd1ff34640462d6b2c9..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 665
|
||
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq000gE005E*1^@s6b?p1;00001b5ch_0Itp)
|
||
z=>Px%Q%OWYRCr#!+P`m4VHC&lOJWcPR#pQE76}@(_qkyZCVv1SG$An%5}T{fa~f=f
|
||
zNhgD!@nbQO2nHGwlNxH$LA8~-_Z*$d6$zgCzK8Qop7E7)+O+qc=X}1!-%nS7PgjZk
|
||
zKSAu*&U4>a_ktNW`xuNi%3#tL42msm8Gg5{56pO^*@j>h^(2EyZ$N0{42oG%*GmcP
|
||
z%DP#HV2FAE!76IaDvCa!aFVr}?C0h)(<^$we0HT~D}tr8M-dF7R~bzD9KkB-HwMMJ
|
||
zfi$-k!J!Mb2f-jZ%wV)p1S`?otYXsFwBj^`)(xDRT8`jg)C~v@NwXKhkn{wD(Jmuc
|
||
ziQb2;+FM$24nph7dS>N6(+duc*d_$a*zQL#NPC3BvkWG?MBx~O`k2C342piFa0bCj
|
||
zY_TYcB?NYVX4#%Fk1!0TW_wSVr)OBPJ;W*|I}M=<h1VgpF$!-oD0&ycO7szJ^$BhD
|
||
z8Ey3?gUQC}&-flz)CpKoKQSmaMO*z!Tb-w^F0fX`7M)?TA6~zlJiEe*_L)J^N!scM
|
||
z-+!wh_Qv<o5t2UjeLPl4AJSIuc)fJ;o`?R)UBj<(=ixz`gI)tt-q$$~f%W_<r$INr
|
||
za0&t^ysi&<IP$$BRnac`UIVMx9`?QJmbGpK5MJj)(pl$~MbdlDYniCWeOFIq-LCgr
|
||
zuZ3h^@CuQ_Th43J*d9Z$jJ6xW9rf%QwC=_Wb_%cH5CO*)I4D8UjBglJik`=T7mnCG
|
||
zLcM%Va0o6zR0_gb5C`)Bnn&I|WaqIy{vyF|YtxJRN!DAm00000NkvXXu0mjfr{^yO
|
||
|
||
diff --git a/chrome/android/java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png b/chrome/android/java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png
|
||
deleted file mode 100644
|
||
index dd0a7352279a4e0fc332f375e3db6b3bd7784f43..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 983
|
||
zcmV;|11S87P)<h;3K|Lk000e1NJLTq000sI006=W1^@s6MDUV$000A?Nkl<ZcwXJw
|
||
z&2Cjy9ES1dU7J&iJy?p0)evC7M+^ZI3KF3M6!Z@C5}Y}3;>Q4UCf<aXpf_LyO#_Aj
|
||
zhzeMvDG4Z=DnwcVTamN(>+mGRiL7_fxQ1)+%k%%A>^;~y005@)2=L1v+yelh>v(1E
|
||
zWdHPkh04ENoB*hXERIJY!GYO#m#3;BMCna5FV#Z;g%c4-a6AHmb{`$wdNu&TSQ(#<
|
||
zKs00^Ss4hi|LEJdHr7MXj7^RmNkG_THUbGU5Ypk9H@@s8iZ(pHb=QGv2!K)!M<B_E
|
||
zB9N^NgtU9+o!gVukU*3D-b^(F&=ntwK(a!RLJ+X+$l&gl1jPELI~ai|dOibL`!W#h
|
||
z4?)_q^Ua0z)sV!xt<z6F7bpTz_D3MQ*%vAzQ$z}qn112CJ5MBv=ufaG0^t-y2|@Di
|
||
z5ER>ycJkUsO`>RQcJHg(>mi`&X-@=_n-GL|MIcaSN8lX~Upyj2rbtqM^cJXq046qc
|
||
zJ0cKjwuc~vig2okP?5DQ1Hp6z5^Nd0m+E#@j_p16RAMx`(t9QXsVUPDsGv*{CR3zX
|
||
zkwQhl(-FvKbErruh^Yu9G5+FPH#Q`SD3jw;5va%b<_P5COi?L>ibSRemra?`a6bas
|
||
zdMpAVPedR=rpS;fB2~m1EK;UOI8$V)m)g;~3}l+rj+!+#nn)EXQ)Kgh-I0t_qYWdF
|
||
zMH?z|rU=untsN=0BP&zHTKv`SM<Am=Q=_d!Af<|&D#D>6iZhT>qd7Jj&Ok<YLPacP
|
||
zidx-{Kt;n0)QV71>&TAUxxv&Q0m#dM>mhSH^(A5{1aUJ0881d4%&!qhkSXd?qsbxY
|
||
zLDy!WB^DFQ_V4q9y?<9jhQ-u}@t-4*@bw7PDFmt2wFopUU8blVmU_srdTy}sW;G=H
|
||
z`omX`1c63S)o5}CqSHbKqWvKP2}hv&pI`p8en+;i^6~3!HG~+ARRwhlL8bjZ1GS;i
|
||
z+;#Pk&5gOi)N(Z>xCBsNgfB-Rx>QjYC^D?h&402`4PoX-&sYrvmjMEhFGV21H}#O|
|
||
zy5Z_q)sW@y<_25t1&VYYpuWh?Ky7I+R6{m@t^9cPN;M?;>x&;Ae2^IJJU}(nSr<ak
|
||
z@LWA)emQe;)3tg?J{$U1JsGI&R1X<1oq50iZ8aq83&8b7>dpexLv{c%D|dfdxL6Gt
|
||
z&Ws+^y3tMnR71ldrvs3GJ3HuKsfG-n0S-VuMa40d=O4`eO{wixoDBc~002ovPDHLk
|
||
FV1jgEwAlav
|
||
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_bar_banner_text_view.xml b/chrome/android/java/res/layout/contextual_search_bar_banner_text_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_bar_banner_text_view.xml
|
||
+++ /dev/null
|
||
@@ -1,24 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!--
|
||
- Copyright 2017 The Chromium Authors. All rights reserved.
|
||
-
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file.
|
||
--->
|
||
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_bar_banner_text_view"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:orientation="horizontal"
|
||
- android:paddingStart="@dimen/contextual_search_bar_banner_padding"
|
||
- android:paddingEnd="@dimen/contextual_search_bar_banner_padding"
|
||
- android:visibility="invisible">
|
||
-
|
||
- <TextView
|
||
- android:id="@+id/contextual_search_iph_tap_text"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:textAppearance="@style/TextAppearance.TextMedium.Primary.Baseline.Light"
|
||
- android:text="@string/contextual_search_iph_tap"
|
||
- />
|
||
-</LinearLayout>
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_caption_view.xml b/chrome/android/java/res/layout/contextual_search_caption_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_caption_view.xml
|
||
+++ /dev/null
|
||
@@ -1,14 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2016 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Contextual Search caption view. -->
|
||
-<FrameLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_caption_view"
|
||
- style="@style/ContextualSearchTextViewLayout" >
|
||
- <TextView
|
||
- android:id="@+id/contextual_search_caption"
|
||
- style="@style/ContextualSearchCaptionTextView" />
|
||
-</FrameLayout>
|
||
\ No newline at end of file
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml b/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml
|
||
+++ /dev/null
|
||
@@ -1,12 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2019 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Contextual Search image view to display a Contextual Card icon. -->
|
||
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_card_icon_view"
|
||
- android:layout_width="@dimen/contextual_search_bar_image_size"
|
||
- android:layout_height="@dimen/contextual_search_bar_image_size"
|
||
- android:importantForAccessibility="no"
|
||
- android:scaleType="center"/>
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_context_view.xml b/chrome/android/java/res/layout/contextual_search_context_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_context_view.xml
|
||
+++ /dev/null
|
||
@@ -1,25 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2015 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Contextual Search search context view. -->
|
||
-<LinearLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_context_view"
|
||
- style="@style/ContextualSearchTextViewLayout"
|
||
- android:gravity="center" >
|
||
- <!-- Search Bar Text -->
|
||
- <TextView
|
||
- android:id="@+id/selected_text"
|
||
- style="@style/ContextualSearchTextView"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_marginStart="7dp"
|
||
- android:layout_marginEnd="5dp"
|
||
- android:gravity="center_horizontal" />
|
||
- <TextView
|
||
- android:id="@+id/surrounding_text_end"
|
||
- style="@style/ContextualSearchContextTextView"
|
||
- android:layout_marginEnd="7dp"
|
||
- android:gravity="start" />
|
||
-</LinearLayout>
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_promo_view.xml b/chrome/android/java/res/layout/contextual_search_promo_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_promo_view.xml
|
||
+++ /dev/null
|
||
@@ -1,66 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2016 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-<FrameLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_promo"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:paddingTop="8dp"
|
||
- android:paddingBottom="16dp"
|
||
- android:paddingStart="16dp"
|
||
- android:paddingEnd="16dp"
|
||
- android:visibility="invisible">
|
||
-
|
||
- <org.chromium.components.browser_ui.widget.MaterialCardViewNoShadow
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- style="@style/MaterialCardStyle">
|
||
-
|
||
- <RelativeLayout
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:orientation="vertical">
|
||
-
|
||
- <org.chromium.ui.widget.TextViewWithClickableSpans
|
||
- android:id="@+id/contextual_search_promo_text"
|
||
- android:layout_alignParentTop="true"
|
||
- android:layout_alignParentStart="true"
|
||
- android:layout_alignParentEnd="true"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginStart="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:bufferType="spannable"
|
||
- android:textAppearance="@style/TextAppearance.TextLarge.Primary" />
|
||
-
|
||
- <org.chromium.ui.widget.ButtonCompat
|
||
- android:id="@+id/contextual_search_allow_button"
|
||
- android:layout_below="@id/contextual_search_promo_text"
|
||
- android:layout_alignParentEnd="true"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_gravity="end"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginBottom="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:text="@string/contextual_search_allow_button"
|
||
- style="@style/FilledButton.Flat" />
|
||
-
|
||
- <org.chromium.ui.widget.ButtonCompat
|
||
- android:id="@+id/contextual_search_no_thanks_button"
|
||
- android:layout_below="@id/contextual_search_promo_text"
|
||
- android:layout_toStartOf="@id/contextual_search_allow_button"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_gravity="end"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginBottom="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:text="@string/contextual_search_no_thanks_button"
|
||
- style="@style/TextButton" />
|
||
- </RelativeLayout>
|
||
- </org.chromium.components.browser_ui.widget.MaterialCardViewNoShadow>
|
||
-</FrameLayout>
|
||
\ No newline at end of file
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_promo_view_revised.xml b/chrome/android/java/res/layout/contextual_search_promo_view_revised.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_promo_view_revised.xml
|
||
+++ /dev/null
|
||
@@ -1,86 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2021 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-<FrameLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
- android:id="@+id/contextual_search_promo"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:paddingTop="8dp"
|
||
- android:paddingBottom="16dp"
|
||
- android:paddingStart="16dp"
|
||
- android:paddingEnd="16dp"
|
||
- android:visibility="invisible">
|
||
-
|
||
- <org.chromium.components.browser_ui.widget.MaterialCardViewNoShadow
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- style="@style/MaterialCardStyle">
|
||
-
|
||
- <RelativeLayout
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content">
|
||
-
|
||
- <org.chromium.components.browser_ui.widget.text.TextViewWithCompoundDrawables
|
||
- android:id="@+id/contextual_search_promo_title"
|
||
- android:layout_alignParentTop="true"
|
||
- android:layout_alignParentStart="true"
|
||
- android:layout_alignParentEnd="true"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginStart="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:bufferType="spannable"
|
||
- android:drawableStart="@drawable/btn_info"
|
||
- app:drawableWidth="24dp"
|
||
- app:drawableHeight="24dp"
|
||
- app:chromeDrawableTint="@macro/default_icon_color_accent1"
|
||
- android:tintMode="src_in"
|
||
- android:drawablePadding="8dp"
|
||
- android:text="@string/contextual_search_promo_title"
|
||
- android:textAppearance="@style/TextAppearance.TextLarge.Primary" />
|
||
-
|
||
- <org.chromium.ui.widget.TextViewWithClickableSpans
|
||
- android:id="@+id/contextual_search_promo_text"
|
||
- android:layout_below="@id/contextual_search_promo_title"
|
||
- android:layout_alignParentStart="true"
|
||
- android:layout_alignParentEnd="true"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_marginTop="8dp"
|
||
- android:layout_marginStart="48dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:bufferType="spannable"
|
||
- android:textAppearance="@style/TextAppearance.TextSmall.Secondary" />
|
||
-
|
||
- <org.chromium.ui.widget.ButtonCompat
|
||
- android:id="@+id/contextual_search_allow_button"
|
||
- android:layout_below="@id/contextual_search_promo_text"
|
||
- android:layout_alignParentEnd="true"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_gravity="end"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginBottom="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:text="@string/contextual_search_include_button"
|
||
- style="@style/FilledButton.Flat" />
|
||
-
|
||
- <org.chromium.ui.widget.ButtonCompat
|
||
- android:id="@+id/contextual_search_no_thanks_button"
|
||
- android:layout_below="@id/contextual_search_promo_text"
|
||
- android:layout_toStartOf="@id/contextual_search_allow_button"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:layout_gravity="end"
|
||
- android:layout_marginTop="16dp"
|
||
- android:layout_marginBottom="16dp"
|
||
- android:layout_marginEnd="16dp"
|
||
- android:text="@string/contextual_search_no_thanks_button"
|
||
- style="@style/TextButton" />
|
||
- </RelativeLayout>
|
||
- </org.chromium.components.browser_ui.widget.MaterialCardViewNoShadow>
|
||
-</FrameLayout>
|
||
\ No newline at end of file
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml b/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml
|
||
+++ /dev/null
|
||
@@ -1,12 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2016 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Contextual Search image view. -->
|
||
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_quick_action_icon_view"
|
||
- android:layout_width="@dimen/contextual_search_bar_image_size"
|
||
- android:layout_height="@dimen/contextual_search_bar_image_size"
|
||
- android:importantForAccessibility="no"
|
||
- android:scaleType="center"/>
|
||
\ No newline at end of file
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml
|
||
+++ /dev/null
|
||
@@ -1,16 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2021 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Displays Related Searches suggestions in a section of the Contextual
|
||
- Search bottom sheet. -->
|
||
-<org.chromium.chrome.browser.compositor.bottombar.contextualsearch.NoSystemGestureFrameLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_related_searches_in_content_view_id"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_height="wrap_content"
|
||
- android:background="@macro/overlay_panel_bar_background_color"
|
||
- android:visibility="invisible">
|
||
- <!-- ChipView elements and their container are dynamically added here. -->
|
||
-</org.chromium.chrome.browser.compositor.bottombar.contextualsearch.NoSystemGestureFrameLayout>
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml
|
||
+++ /dev/null
|
||
@@ -1,21 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2021 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Displays Related Searches suggestions in the Bar of the Overlay Panel. -->
|
||
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_related_searches_view_id"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:visibility="invisible">
|
||
- <org.chromium.chrome.browser.compositor.bottombar.contextualsearch.NoSystemGestureFrameLayout
|
||
- android:id="@+id/contextual_search_related_searches_view_control_id"
|
||
- android:layout_width="wrap_content"
|
||
- android:layout_height="wrap_content"
|
||
- android:background="@macro/overlay_panel_bar_background_color"
|
||
- android:layout_marginBottom="@dimen/toolbar_progress_bar_height"
|
||
- android:layout_gravity="top">
|
||
- <!-- ChipView elements and their container are dynamically added here. -->
|
||
- </org.chromium.chrome.browser.compositor.bottombar.contextualsearch.NoSystemGestureFrameLayout>
|
||
-</FrameLayout>
|
||
diff --git a/chrome/android/java/res/layout/contextual_search_term_view.xml b/chrome/android/java/res/layout/contextual_search_term_view.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/layout/contextual_search_term_view.xml
|
||
+++ /dev/null
|
||
@@ -1,19 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2015 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<!-- Contextual Search search term view. -->
|
||
-<FrameLayout
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- android:id="@+id/contextual_search_term_view"
|
||
- style="@style/ContextualSearchTextViewLayout" >
|
||
- <TextView
|
||
- android:id="@+id/contextual_search_term"
|
||
- style="@style/ContextualSearchTextView"
|
||
- android:layout_width="match_parent"
|
||
- android:layout_gravity="bottom"
|
||
- android:background="@macro/overlay_panel_bar_background_color"
|
||
- android:layout_marginStart="7dp"
|
||
- android:layout_marginEnd="7dp" />
|
||
-</FrameLayout>
|
||
diff --git a/chrome/android/java/res/xml/contextual_search_preferences.xml b/chrome/android/java/res/xml/contextual_search_preferences.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/xml/contextual_search_preferences.xml
|
||
+++ /dev/null
|
||
@@ -1,25 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2015 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<PreferenceScreen
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- xmlns:app="http://schemas.android.com/apk/res-auto">
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="contextual_search_switch"
|
||
- android:summaryOn="@string/text_on"
|
||
- android:summaryOff="@string/text_off" />
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="see_better_results_switch"
|
||
- android:title="@string/contextual_search_see_better_results_title"
|
||
- android:summary="@string/contextual_search_see_better_results_summary" />
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.TextMessagePreference
|
||
- android:key="contextual_search_description"
|
||
- android:title="@string/contextual_search_description"
|
||
- app:allowDividerBelow="false" />
|
||
-
|
||
-</PreferenceScreen>
|
||
diff --git a/chrome/android/java/res/xml/contextual_search_tap_preferences.xml b/chrome/android/java/res/xml/contextual_search_tap_preferences.xml
|
||
deleted file mode 100644
|
||
--- a/chrome/android/java/res/xml/contextual_search_tap_preferences.xml
|
||
+++ /dev/null
|
||
@@ -1,26 +0,0 @@
|
||
-<?xml version="1.0" encoding="utf-8"?>
|
||
-<!-- Copyright 2020 The Chromium Authors. All rights reserved.
|
||
- Use of this source code is governed by a BSD-style license that can be
|
||
- found in the LICENSE file. -->
|
||
-
|
||
-<PreferenceScreen
|
||
- xmlns:android="http://schemas.android.com/apk/res/android"
|
||
- xmlns:app="http://schemas.android.com/apk/res-auto">
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="contextual_search_switch"
|
||
- android:summaryOn="@string/text_on"
|
||
- android:summaryOff="@string/text_off" />
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="see_better_results_switch"
|
||
- android:title="@string/contextual_search_see_better_results_title"
|
||
- android:summary="@string/contextual_search_see_better_results_summary" />
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.TextMessagePreference
|
||
- android:key="contextual_search_description"
|
||
- android:title="@string/contextual_search_tap_description"
|
||
- app:allowDividerBelow="false" />
|
||
-
|
||
-</PreferenceScreen>
|
||
-
|
||
diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
|
||
--- a/chrome/android/java/res/xml/google_services_preferences.xml
|
||
+++ b/chrome/android/java/res/xml/google_services_preferences.xml
|
||
@@ -40,8 +40,4 @@
|
||
android:summary="@string/prefs_autofill_assistant_summary"
|
||
android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment"
|
||
app:isPreferenceVisible="false"/>
|
||
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
|
||
- android:key="contextual_search"
|
||
- android:title="@string/contextual_search_title"
|
||
- android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
|
||
</PreferenceScreen>
|
||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||
@@ -67,10 +67,6 @@
|
||
android:title="@string/autocomplete_searches_and_urls_title"
|
||
android:summary="@string/autocomplete_searches_and_urls_summary"
|
||
android:persistent="false"/>
|
||
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
|
||
- android:key="contextual_search"
|
||
- android:title="@string/contextual_search_title"
|
||
- android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
|
||
</PreferenceCategory>
|
||
<Preference
|
||
android:key="phone_as_a_security_key"
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||
@@ -1678,7 +1678,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||
protected RootUiCoordinator createRootUiCoordinator() {
|
||
return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged,
|
||
getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
|
||
- mBookmarkBridgeSupplier, getContextualSearchManagerSupplier(),
|
||
+ mBookmarkBridgeSupplier, null,
|
||
getTabModelSelectorSupplier(), mStartSurfaceSupplier,
|
||
mIntentMetadataOneshotSupplier, mLayoutStateProviderOneshotSupplier,
|
||
mStartSurfaceParentTabSupplier, getBrowserControlsManager(), getWindowAndroid(),
|
||
@@ -2719,7 +2719,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||
// TODO(crbug.com/1157310): Transition this::method refs to dedicated suppliers.
|
||
mTabModalHandler = new TabModalLifetimeHandler(this, getLifecycleDispatcher(), manager,
|
||
this::getAppBrowserControlsVisibilityDelegate, this::getTabObscuringHandler,
|
||
- this::getToolbarManager, getContextualSearchManagerSupplier(),
|
||
+ this::getToolbarManager, null,
|
||
getTabModelSelectorSupplier(), this::getBrowserControlsManager,
|
||
this::getFullscreenManager);
|
||
return manager;
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||
@@ -99,9 +99,6 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvider;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
|
||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
|
||
import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
|
||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
|
||
@@ -260,7 +257,7 @@ import java.util.function.Consumer;
|
||
*/
|
||
public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
extends AsyncInitializationActivity
|
||
- implements TabCreatorManager, PolicyChangeListener, ContextualSearchTabPromotionDelegate,
|
||
+ implements TabCreatorManager, PolicyChangeListener,
|
||
SnackbarManageable, SceneChangeObserver,
|
||
StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker,
|
||
MenuOrKeyboardActionController, CompositorViewHolder.Initializer,
|
||
@@ -322,8 +319,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
new ObservableSupplierImpl<>();
|
||
protected final UnownedUserDataSupplier<InsetObserverView> mInsetObserverViewSupplier =
|
||
new InsetObserverViewSupplier();
|
||
- private final ObservableSupplierImpl<ContextualSearchManager> mContextualSearchManagerSupplier =
|
||
- new ObservableSupplierImpl<>();
|
||
private SnackbarManager mSnackbarManager;
|
||
|
||
// Timestamp in ms when initial layout inflation begins
|
||
@@ -515,7 +510,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
// clang-format off
|
||
return new RootUiCoordinator(this, null, getShareDelegateSupplier(),
|
||
getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier,
|
||
- getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(),
|
||
+ null, getTabModelSelectorSupplier(),
|
||
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
|
||
new OneshotSupplierImpl<>(),
|
||
() -> null, mBrowserControlsManagerSupplier.get(), getWindowAndroid(),
|
||
@@ -984,14 +979,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
mCompositorViewHolderSupplier.get().onNativeLibraryReady(
|
||
getWindowAndroid(), getTabContentManager());
|
||
|
||
- // TODO(1107916): Move contextual search initialization to the RootUiCoordinator.
|
||
- if (ContextualSearchFieldTrial.isEnabled()) {
|
||
- mContextualSearchManagerSupplier.set(new ContextualSearchManager(this, this,
|
||
- mRootUiCoordinator.getScrimCoordinator(), getActivityTabProvider(),
|
||
- getFullscreenManager(), getBrowserControlsManager(), getWindowAndroid(),
|
||
- getTabModelSelectorSupplier().get(), () -> getLastUserInteractionTime()));
|
||
- }
|
||
-
|
||
TraceEvent.end("ChromeActivity:CompositorInitialization");
|
||
}
|
||
|
||
@@ -1471,11 +1458,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
@SuppressLint("NewApi")
|
||
@Override
|
||
protected final void onDestroy() {
|
||
- if (mContextualSearchManagerSupplier.hasValue()) {
|
||
- mContextualSearchManagerSupplier.get().destroy();
|
||
- mContextualSearchManagerSupplier.set(null);
|
||
- }
|
||
-
|
||
if (mSnackbarManager != null) {
|
||
SnackbarManagerProvider.detach(mSnackbarManager);
|
||
}
|
||
@@ -2089,13 +2071,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
return mCompositorViewHolderSupplier.get();
|
||
}
|
||
|
||
- /**
|
||
- * @return The {@code ContextualSearchManager} or {@code null} if none;
|
||
- */
|
||
- public ObservableSupplier<ContextualSearchManager> getContextualSearchManagerSupplier() {
|
||
- return mContextualSearchManagerSupplier;
|
||
- }
|
||
-
|
||
/**
|
||
* Exits the fullscreen mode, if any. Does nothing if no fullscreen is present.
|
||
* @return Whether the fullscreen mode is currently showing.
|
||
@@ -2138,15 +2113,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
}
|
||
|
||
mActivityTabProvider.setLayoutStateProvider(layoutManager);
|
||
-
|
||
- if (mContextualSearchManagerSupplier.hasValue()) {
|
||
- mContextualSearchManagerSupplier.get().initialize(contentContainer, layoutManager,
|
||
- mRootUiCoordinator.getBottomSheetController(), compositorViewHolder,
|
||
- getControlContainerHeightResource() == ActivityUtils.NO_RESOURCE_ID
|
||
- ? 0f
|
||
- : getResources().getDimension(getControlContainerHeightResource()),
|
||
- getToolbarManager(), getActivityType(), getIntentRequestTracker());
|
||
- }
|
||
}
|
||
|
||
/**
|
||
@@ -2329,18 +2295,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||
return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
|
||
}
|
||
|
||
- @Override
|
||
- public void createContextualSearchTab(String searchUrl) {
|
||
- Tab currentTab = getActivityTab();
|
||
- if (currentTab == null) return;
|
||
-
|
||
- TabCreator tabCreator = getTabCreator(currentTab.isIncognito());
|
||
- if (tabCreator == null) return;
|
||
-
|
||
- tabCreator.createNewTab(new LoadUrlParams(searchUrl, PageTransition.LINK),
|
||
- TabLaunchType.FROM_LINK, getActivityTab());
|
||
- }
|
||
-
|
||
/** Opens the chrome://management page on a new tab. */
|
||
private void openChromeManagementPage() {
|
||
Tab currentTab = getActivityTab();
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
||
@@ -19,7 +19,6 @@ import org.chromium.base.annotations.NativeMethods;
|
||
import org.chromium.base.supplier.Supplier;
|
||
import org.chromium.chrome.browser.WebContentsFactory;
|
||
import org.chromium.chrome.browser.content.ContentUtils;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
|
||
import org.chromium.chrome.browser.incognito.IncognitoUtils;
|
||
import org.chromium.chrome.browser.profiles.Profile;
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
|
||
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
|
||
import org.chromium.chrome.browser.browser_controls.BrowserControlsUtils;
|
||
import org.chromium.chrome.browser.browser_controls.BrowserControlsVisibilityManager;
|
||
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
|
||
-import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
|
||
import org.chromium.chrome.browser.compositor.layouts.Layout.Orientation;
|
||
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||
@@ -276,8 +275,7 @@ public class LayoutManagerImpl implements ManagedLayoutManager, LayoutUpdateHost
|
||
// it causes relocation tab strip scene layer.
|
||
StripLayoutHelperManager.class,
|
||
ScrollingBottomViewSceneLayer.class,
|
||
- StatusIndicatorCoordinator.getSceneOverlayClass(),
|
||
- ContextualSearchPanel.class};
|
||
+ StatusIndicatorCoordinator.getSceneOverlayClass()};
|
||
// clang-format on
|
||
|
||
for (int i = 0; i < overlayOrder.length; i++) mOverlayOrderMap.put(overlayOrder[i], i);
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||
@@ -154,7 +154,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
|
||
mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this,
|
||
getShareDelegateSupplier(),
|
||
getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier,
|
||
- getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(),
|
||
+ null, getTabModelSelectorSupplier(),
|
||
getBrowserControlsManager(), getWindowAndroid(), getLifecycleDispatcher(),
|
||
getLayoutManagerSupplier(),
|
||
/* menuOrKeyboardActionController= */ this, this::getActivityThemeColor,
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
|
||
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
|
||
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
|
||
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
|
||
import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbar;
|
||
import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
|
||
@@ -104,7 +103,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
|
||
@NonNull ActivityTabProvider tabProvider,
|
||
@NonNull ObservableSupplier<Profile> profileSupplier,
|
||
@NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
|
||
- @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
|
||
+ Object ignored,
|
||
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
|
||
@NonNull BrowserControlsManager browserControlsManager,
|
||
@NonNull ActivityWindowAndroid windowAndroid,
|
||
@@ -134,7 +133,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
|
||
@NonNull OmniboxPedalDelegate omniboxPedalDelegate) {
|
||
// clang-format off
|
||
super(activity, null, shareDelegateSupplier, tabProvider, profileSupplier,
|
||
- bookmarkBridgeSupplier, contextualSearchManagerSupplier, tabModelSelectorSupplier,
|
||
+ bookmarkBridgeSupplier, null, tabModelSelectorSupplier,
|
||
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
|
||
new OneshotSupplierImpl<>(), () -> null,
|
||
browserControlsManager, windowAndroid, new DummyJankTracker(),
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||
@@ -188,12 +188,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
|
||
mIntentDataProvider.getSession(), webContents);
|
||
}
|
||
|
||
- @Override
|
||
- public void createContextualSearchTab(String searchUrl) {
|
||
- if (getActivityTab() == null) return;
|
||
- getActivityTab().loadUrl(new LoadUrlParams(searchUrl));
|
||
- }
|
||
-
|
||
@Override
|
||
public String getPackageName() {
|
||
if (mShouldOverridePackage && mIntentDataProvider instanceof CustomTabIntentDataProvider) {
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
|
||
@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
|
||
import org.chromium.chrome.browser.browser_controls.BrowserControlsUtils;
|
||
import org.chromium.chrome.browser.browser_controls.BrowserControlsVisibilityManager;
|
||
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
|
||
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
|
||
import org.chromium.chrome.browser.tab.Tab;
|
||
@@ -49,7 +48,6 @@ public class ChromeTabModalPresenter
|
||
private final Activity mActivity;
|
||
private final Supplier<TabObscuringHandler> mTabObscuringHandlerSupplier;
|
||
private final Supplier<ToolbarManager> mToolbarManagerSupplier;
|
||
- private final Supplier<ContextualSearchManager> mContextualSearchManagerSupplier;
|
||
private final FullscreenManager mFullscreenManager;
|
||
private final BrowserControlsVisibilityManager mBrowserControlsVisibilityManager;
|
||
private final TabModalBrowserControlsVisibilityDelegate mVisibilityDelegate;
|
||
@@ -96,7 +94,7 @@ public class ChromeTabModalPresenter
|
||
public ChromeTabModalPresenter(Activity activity,
|
||
Supplier<TabObscuringHandler> tabObscuringHandlerSupplier,
|
||
Supplier<ToolbarManager> toolbarManagerSupplier,
|
||
- Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
|
||
+ Object ignored,
|
||
FullscreenManager fullscreenManager,
|
||
BrowserControlsVisibilityManager browserControlsVisibilityManager,
|
||
TabModelSelector tabModelSelector) {
|
||
@@ -109,7 +107,6 @@ public class ChromeTabModalPresenter
|
||
mBrowserControlsVisibilityManager.addObserver(this);
|
||
mVisibilityDelegate = new TabModalBrowserControlsVisibilityDelegate();
|
||
mTabObscuringToken = TokenHolder.INVALID_TOKEN;
|
||
- mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
|
||
mTabModelSelector = tabModelSelector;
|
||
}
|
||
|
||
@@ -196,13 +193,6 @@ public class ChromeTabModalPresenter
|
||
assert mActiveTab
|
||
!= null : "Tab modal dialogs should be shown on top of an active tab.";
|
||
|
||
- // Hide contextual search panel so that bottom toolbar will not be
|
||
- // obscured and back press is not overridden.
|
||
- if (mContextualSearchManagerSupplier.hasValue()) {
|
||
- mContextualSearchManagerSupplier.get().hideContextualSearch(
|
||
- OverlayPanel.StateChangeReason.UNKNOWN);
|
||
- }
|
||
-
|
||
// Dismiss the action bar that obscures the dialogs but preserve the text selection.
|
||
WebContents webContents = mActiveTab.getWebContents();
|
||
if (webContents != null) {
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java
|
||
@@ -8,7 +8,6 @@ import android.app.Activity;
|
||
|
||
import org.chromium.base.supplier.Supplier;
|
||
import org.chromium.chrome.browser.browser_controls.BrowserControlsVisibilityManager;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
|
||
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
|
||
import org.chromium.chrome.browser.lifecycle.DestroyObserver;
|
||
@@ -65,7 +64,6 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
|
||
mAppVisibilityDelegateSupplier;
|
||
private final Supplier<TabObscuringHandler> mTabObscuringHandlerSupplier;
|
||
private final Supplier<ToolbarManager> mToolbarManagerSupplier;
|
||
- private final Supplier<ContextualSearchManager> mContextualSearchManagerSupplier;
|
||
private final Supplier<TabModelSelector> mTabModelSelectorSupplier;
|
||
private final Supplier<BrowserControlsVisibilityManager>
|
||
mBrowserControlsVisibilityManagerSupplier;
|
||
@@ -95,7 +93,7 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
|
||
Supplier<ComposedBrowserControlsVisibilityDelegate> appVisibilityDelegateSupplier,
|
||
Supplier<TabObscuringHandler> tabObscuringHandlerSupplier,
|
||
Supplier<ToolbarManager> toolbarManagerSupplier,
|
||
- Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
|
||
+ Object ignored,
|
||
Supplier<TabModelSelector> tabModelSelectorSupplier,
|
||
Supplier<BrowserControlsVisibilityManager> browserControlsVisibilityManagerSupplier,
|
||
Supplier<FullscreenManager> fullscreenManagerSupplier) {
|
||
@@ -110,7 +108,6 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
|
||
mFullscreenManagerSupplier = fullscreenManagerSupplier;
|
||
mBrowserControlsVisibilityManagerSupplier = browserControlsVisibilityManagerSupplier;
|
||
mVisibilityDelegate = new TabModalBrowserControlsVisibilityDelegate();
|
||
- mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
|
||
mTabModelSelectorSupplier = tabModelSelectorSupplier;
|
||
}
|
||
|
||
@@ -140,7 +137,7 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
|
||
assert mBrowserControlsVisibilityManagerSupplier.hasValue();
|
||
assert mFullscreenManagerSupplier.hasValue();
|
||
mPresenter = new ChromeTabModalPresenter(mActivity, mTabObscuringHandlerSupplier,
|
||
- mToolbarManagerSupplier, mContextualSearchManagerSupplier,
|
||
+ mToolbarManagerSupplier, null,
|
||
mFullscreenManagerSupplier.get(), mBrowserControlsVisibilityManagerSupplier.get(),
|
||
tabModelSelector);
|
||
assert mAppVisibilityDelegateSupplier.hasValue();
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
||
@@ -48,7 +48,6 @@ import org.chromium.ui.text.SpanApplier;
|
||
|
||
import androidx.annotation.Nullable;
|
||
import androidx.preference.PreferenceCategory;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
|
||
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||
|
||
@@ -74,9 +73,7 @@ public class PrivacySettings
|
||
// moved from SyncAndServicesSettings.java
|
||
private static final String PREF_SERVICES_CATEGORY = "services_category";
|
||
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
|
||
- private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||
private ChromeSwitchPreference mSearchSuggestions;
|
||
- private @Nullable Preference mContextualSearch;
|
||
private final SharedPreferencesManager mSharedPreferencesManager =
|
||
SharedPreferencesManager.getInstance();
|
||
private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
|
||
@@ -134,12 +131,6 @@ public class PrivacySettings
|
||
mSearchSuggestions.setOnPreferenceChangeListener(this);
|
||
mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||
|
||
- mContextualSearch = findPreference(PREF_CONTEXTUAL_SEARCH);
|
||
- boolean isContextualSearchEnabled =
|
||
- !ContextualSearchManager.isContextualSearchDisabled();
|
||
- mContextualSearch.setSummary(
|
||
- isContextualSearchEnabled ? R.string.text_on : R.string.text_off);
|
||
-
|
||
ChromeSwitchPreference canMakePaymentPref =
|
||
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||
canMakePaymentPref.setOnPreferenceChangeListener(this);
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.tab;
|
||
import org.chromium.chrome.browser.SwipeRefreshHandler;
|
||
import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantTabHelper;
|
||
import org.chromium.chrome.browser.complex_tasks.TaskTabHelper;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper;
|
||
import org.chromium.chrome.browser.continuous_search.ContinuousSearchTabHelper;
|
||
import org.chromium.chrome.browser.crypto.CipherFactory;
|
||
import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
|
||
@@ -32,7 +31,6 @@ public final class TabHelpers {
|
||
TabUma.createForTab(tab);
|
||
TabDistillabilityProvider.createForTab(tab);
|
||
InterceptNavigationDelegateTabHelper.createForTab(tab);
|
||
- ContextualSearchTabHelper.createForTab(tab);
|
||
MediaSessionTabHelper.createForTab(tab);
|
||
TaskTabHelper.createForTab(tab, parentTab);
|
||
TabBrowserControlsConstraintsHelper.createForTab(tab);
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
|
||
@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTa
|
||
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
|
||
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator;
|
||
import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator.HeightObserver;
|
||
import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
|
||
@@ -252,7 +251,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
|
||
@NonNull ActivityTabProvider tabProvider,
|
||
@NonNull ObservableSupplier<Profile> profileSupplier,
|
||
@NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
|
||
- @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
|
||
+ Object ignored,
|
||
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
|
||
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
|
||
@NonNull OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
|
||
@@ -287,7 +286,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
|
||
@NonNull OmniboxPedalDelegate omniboxPedalDelegate,
|
||
boolean initializeUiWithIncognitoColors) {
|
||
super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
|
||
- profileSupplier, bookmarkBridgeSupplier, contextualSearchManagerSupplier,
|
||
+ profileSupplier, bookmarkBridgeSupplier, null,
|
||
tabModelSelectorSupplier, startSurfaceSupplier, intentMetadataOneshotSupplier,
|
||
layoutStateProviderOneshotSupplier, startSurfaceParentTabSupplier,
|
||
browserControlsManager, windowAndroid, jankTracker, activityLifecycleDispatcher,
|
||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||
@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
|
||
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
|
||
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
|
||
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||
import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
|
||
import org.chromium.chrome.browser.directactions.DirectActionInitializer;
|
||
import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
|
||
@@ -218,8 +217,6 @@ public class RootUiCoordinator
|
||
protected final ObservableSupplier<Profile> mProfileSupplier;
|
||
private final ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier;
|
||
private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
|
||
- private BottomSheetObserver mContextualSearchSuppressor;
|
||
- private final Supplier<ContextualSearchManager> mContextualSearchManagerSupplier;
|
||
protected final CallbackController mCallbackController;
|
||
protected final BrowserControlsManager mBrowserControlsManager;
|
||
protected ObservableSupplier<TabModelSelector> mTabModelSelectorSupplier;
|
||
@@ -309,7 +306,7 @@ public class RootUiCoordinator
|
||
@NonNull ActivityTabProvider tabProvider,
|
||
@NonNull ObservableSupplier<Profile> profileSupplier,
|
||
@NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
|
||
- @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier,
|
||
+ Object ignored,
|
||
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
|
||
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
|
||
@NonNull OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
|
||
@@ -392,7 +389,6 @@ public class RootUiCoordinator
|
||
mProfileSupplier = profileSupplier;
|
||
mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
|
||
mAppMenuSupplier = new OneshotSupplierImpl<>();
|
||
- mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
|
||
mActionModeControllerCallback = new ToolbarActionModeCallback();
|
||
|
||
mTabModelSelectorSupplier = tabModelSelectorSupplier;
|
||
@@ -513,9 +509,6 @@ public class RootUiCoordinator
|
||
|
||
if (mBottomSheetManager != null) mBottomSheetManager.onDestroy();
|
||
if (mBottomSheetController != null) {
|
||
- if (mContextualSearchSuppressor != null) {
|
||
- mBottomSheetController.removeObserver(mContextualSearchSuppressor);
|
||
- }
|
||
BottomSheetControllerFactory.detach(mBottomSheetController);
|
||
mBottomSheetController.destroy();
|
||
}
|
||
@@ -590,7 +583,6 @@ public class RootUiCoordinator
|
||
public void onPostInflationStartup() {
|
||
initAppMenu();
|
||
initDirectActionInitializer();
|
||
- initContextualSearchSuppressor();
|
||
if (mAppMenuCoordinator != null && mModalDialogManagerSupplier.hasValue()) {
|
||
mModalDialogManagerObserver = new ModalDialogManagerObserver() {
|
||
@Override
|
||
@@ -813,15 +805,6 @@ public class RootUiCoordinator
|
||
|
||
@Override
|
||
public boolean canShowAppMenu() {
|
||
- // TODO(https:crbug.com/931496): Eventually the ContextualSearchManager,
|
||
- // EphemeralTabCoordinator, and FindToolbarManager will all be owned by this class.
|
||
-
|
||
- // Do not show the menu if Contextual Search panel is opened.
|
||
- if (mContextualSearchManagerSupplier.get() != null
|
||
- && mContextualSearchManagerSupplier.get().isSearchPanelOpened()) {
|
||
- return false;
|
||
- }
|
||
-
|
||
// Do not show the menu if we are in find in page view.
|
||
if (mFindToolbarManager != null && mFindToolbarManager.isShowing()
|
||
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
|
||
@@ -1020,10 +1003,6 @@ public class RootUiCoordinator
|
||
public void onStartedShowing(int layoutType, boolean showToolbar) {
|
||
if (layoutType != LayoutType.BROWSING
|
||
&& layoutType != LayoutType.SIMPLE_ANIMATION) {
|
||
- // Hide contextual search.
|
||
- if (mContextualSearchManagerSupplier.get() != null) {
|
||
- mContextualSearchManagerSupplier.get().dismissContextualSearchBar();
|
||
- }
|
||
}
|
||
|
||
if (layoutType == LayoutType.TAB_SWITCHER) {
|
||
@@ -1117,10 +1096,6 @@ public class RootUiCoordinator
|
||
* cross-feature interaction, e.g. hide other features when this feature is shown.
|
||
*/
|
||
protected void onFindToolbarShown() {
|
||
- if (mContextualSearchManagerSupplier.get() != null) {
|
||
- mContextualSearchManagerSupplier.get().hideContextualSearch(
|
||
- OverlayPanel.StateChangeReason.UNKNOWN);
|
||
- }
|
||
}
|
||
|
||
/**
|
||
@@ -1226,39 +1201,6 @@ public class RootUiCoordinator
|
||
mActivityLifecycleDispatcher.register(mDirectActionInitializer);
|
||
}
|
||
|
||
- /**
|
||
- * Initializes a glue logic that suppresses Contextual Search while a Bottom Sheet feature is
|
||
- * in action.
|
||
- */
|
||
- private void initContextualSearchSuppressor() {
|
||
- if (mBottomSheetController == null) return;
|
||
- mContextualSearchSuppressor = new EmptyBottomSheetObserver() {
|
||
- private boolean mOpened;
|
||
-
|
||
- @Override
|
||
- public void onSheetStateChanged(int newState, int reason) {
|
||
- switch (newState) {
|
||
- case SheetState.PEEK:
|
||
- case SheetState.HALF:
|
||
- case SheetState.FULL:
|
||
- if (!mOpened) {
|
||
- mOpened = true;
|
||
- ContextualSearchManager manager =
|
||
- mContextualSearchManagerSupplier.get();
|
||
- if (manager != null) manager.onBottomSheetVisible(true);
|
||
- }
|
||
- break;
|
||
- case SheetState.HIDDEN:
|
||
- mOpened = false;
|
||
- ContextualSearchManager manager = mContextualSearchManagerSupplier.get();
|
||
- if (manager != null) manager.onBottomSheetVisible(false);
|
||
- break;
|
||
- }
|
||
- }
|
||
- };
|
||
- mBottomSheetController.addObserver(mContextualSearchSuppressor);
|
||
- }
|
||
-
|
||
// Testing methods
|
||
|
||
@VisibleForTesting
|
||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||
--- a/chrome/browser/BUILD.gn
|
||
+++ b/chrome/browser/BUILD.gn
|
||
@@ -2045,9 +2045,6 @@ static_library("browser") {
|
||
"//components/content_settings/core/browser",
|
||
"//components/content_settings/core/common",
|
||
"//components/contextual_search:buildflags",
|
||
- "//components/contextual_search/content:browser",
|
||
- "//components/contextual_search/content/common/mojom",
|
||
- "//components/contextual_search/core:browser",
|
||
"//components/continuous_search/browser",
|
||
"//components/continuous_search/common/public/mojom",
|
||
"//components/cookie_config",
|
||
@@ -2636,8 +2633,6 @@ static_library("browser") {
|
||
"android/compositor/decoration_title.h",
|
||
"android/compositor/layer/content_layer.cc",
|
||
"android/compositor/layer/content_layer.h",
|
||
- "android/compositor/layer/contextual_search_layer.cc",
|
||
- "android/compositor/layer/contextual_search_layer.h",
|
||
"android/compositor/layer/layer.h",
|
||
"android/compositor/layer/overlay_panel_layer.cc",
|
||
"android/compositor/layer/overlay_panel_layer.h",
|
||
@@ -2658,8 +2653,6 @@ static_library("browser") {
|
||
"android/compositor/resources/resource_factory.cc",
|
||
"android/compositor/resources/toolbar_resource.cc",
|
||
"android/compositor/resources/toolbar_resource.h",
|
||
- "android/compositor/scene_layer/contextual_search_scene_layer.cc",
|
||
- "android/compositor/scene_layer/contextual_search_scene_layer.h",
|
||
"android/compositor/scene_layer/continuous_search_scene_layer.cc",
|
||
"android/compositor/scene_layer/continuous_search_scene_layer.h",
|
||
"android/compositor/scene_layer/overscroll_scene_layer.cc",
|
||
@@ -2684,28 +2677,6 @@ static_library("browser") {
|
||
"android/content/content_utils.cc",
|
||
"android/context_menu/context_menu_native_delegate_impl.cc",
|
||
"android/context_menu/context_menu_native_delegate_impl.h",
|
||
- "android/contextualsearch/contextual_search_context.cc",
|
||
- "android/contextualsearch/contextual_search_context.h",
|
||
- "android/contextualsearch/contextual_search_delegate.cc",
|
||
- "android/contextualsearch/contextual_search_delegate.h",
|
||
- "android/contextualsearch/contextual_search_field_trial.cc",
|
||
- "android/contextualsearch/contextual_search_field_trial.h",
|
||
- "android/contextualsearch/contextual_search_manager.cc",
|
||
- "android/contextualsearch/contextual_search_manager.h",
|
||
- "android/contextualsearch/contextual_search_observer.cc",
|
||
- "android/contextualsearch/contextual_search_observer.h",
|
||
- "android/contextualsearch/contextual_search_ranker_logger_impl.cc",
|
||
- "android/contextualsearch/contextual_search_ranker_logger_impl.h",
|
||
- "android/contextualsearch/contextual_search_tab_helper.cc",
|
||
- "android/contextualsearch/contextual_search_tab_helper.h",
|
||
- "android/contextualsearch/ctr_suppression.cc",
|
||
- "android/contextualsearch/ctr_suppression.h",
|
||
- "android/contextualsearch/resolved_search_term.cc",
|
||
- "android/contextualsearch/resolved_search_term.h",
|
||
- "android/contextualsearch/unhandled_tap_notifier_impl.cc",
|
||
- "android/contextualsearch/unhandled_tap_notifier_impl.h",
|
||
- "android/contextualsearch/unhandled_tap_web_contents_observer.cc",
|
||
- "android/contextualsearch/unhandled_tap_web_contents_observer.h",
|
||
"android/cookies/cookies_fetcher_util.cc",
|
||
"android/customtabs/client_data_header_web_contents_observer.cc",
|
||
"android/customtabs/client_data_header_web_contents_observer.h",
|
||
@@ -3288,8 +3259,6 @@ static_library("browser") {
|
||
"safe_browsing/android/safe_browsing_referring_app_bridge_android.h",
|
||
"safe_browsing/android/safe_browsing_settings_launcher_android.cc",
|
||
"safe_browsing/android/safe_browsing_settings_launcher_android.h",
|
||
- "search/contextual_search_policy_handler_android.cc",
|
||
- "search/contextual_search_policy_handler_android.h",
|
||
"search_engines/template_url_service_factory_android.cc",
|
||
"search_engines/ui_thread_search_terms_data_android.cc",
|
||
"search_engines/ui_thread_search_terms_data_android.h",
|
||
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
|
||
@@ -1720,23 +1720,6 @@ const FeatureEntry::FeatureVariation kExploreSitesVariations[] = {
|
||
std::size(kExploreSitesDenseTitleBottom), nullptr},
|
||
{"Dense Title Right", kExploreSitesDenseTitleRight,
|
||
std::size(kExploreSitesDenseTitleRight), nullptr}};
|
||
-const FeatureEntry::FeatureParam kLongpressResolvePreserveTap = {
|
||
- contextual_search::kLongpressResolveParamName,
|
||
- contextual_search::kLongpressResolvePreserveTap};
|
||
-const FeatureEntry::FeatureVariation kLongpressResolveVariations[] = {
|
||
- {"and preserve Tap behavior", &kLongpressResolvePreserveTap, 1, nullptr},
|
||
-};
|
||
-
|
||
-const FeatureEntry::FeatureParam kContextualSearchPromoCardShow3Times = {
|
||
- "promo_card_max_shown", "3"};
|
||
-const FeatureEntry::FeatureParam kContextualSearchPromoCardShow100Times = {
|
||
- "promo_card_max_shown", "100"};
|
||
-const FeatureEntry::FeatureVariation ContextualSearchNewSettingsVariations[] = {
|
||
- {"with promo show 3 times", &kContextualSearchPromoCardShow3Times, 1,
|
||
- nullptr},
|
||
- {"with promo show 100 times", &kContextualSearchPromoCardShow100Times, 1,
|
||
- nullptr},
|
||
-};
|
||
|
||
const FeatureEntry::FeatureParam kRelatedSearchesUrl = {"stamp", "1Ru"};
|
||
const FeatureEntry::FeatureParam kRelatedSearchesContent = {"stamp", "1Rc"};
|
||
@@ -3229,65 +3212,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||
flag_descriptions::kCSSContainerQueriesDescription, kOsAll,
|
||
FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)},
|
||
#if BUILDFLAG(IS_ANDROID)
|
||
- {"contextual-search-debug", flag_descriptions::kContextualSearchDebugName,
|
||
- flag_descriptions::kContextualSearchDebugDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualSearchDebug)},
|
||
- {"contextual-search-delayed-intelligence",
|
||
- flag_descriptions::kContextualSearchDelayedIntelligenceName,
|
||
- flag_descriptions::kContextualSearchDelayedIntelligenceDescription,
|
||
- kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualSearchDelayedIntelligence)},
|
||
- {"contextual-search-force-caption",
|
||
- flag_descriptions::kContextualSearchForceCaptionName,
|
||
- flag_descriptions::kContextualSearchForceCaptionDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualSearchForceCaption)},
|
||
- {"contextual-search-longpress-resolve",
|
||
- flag_descriptions::kContextualSearchLongpressResolveName,
|
||
- flag_descriptions::kContextualSearchLongpressResolveDescription,
|
||
- kOsAndroid,
|
||
- FEATURE_WITH_PARAMS_VALUE_TYPE(
|
||
- chrome::android::kContextualSearchLongpressResolve,
|
||
- kLongpressResolveVariations,
|
||
- "ContextualSearchLongpressResolve")},
|
||
- {"contextual-search-ml-tap-suppression",
|
||
- flag_descriptions::kContextualSearchMlTapSuppressionName,
|
||
- flag_descriptions::kContextualSearchMlTapSuppressionDescription,
|
||
- kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualSearchMlTapSuppression)},
|
||
- {"contextual-search-new-settings",
|
||
- flag_descriptions::KContextualSearchNewSettingsName,
|
||
- flag_descriptions::KContextualSearchNewSettingsDescription, kOsAndroid,
|
||
- FEATURE_WITH_PARAMS_VALUE_TYPE(
|
||
- chrome::android::KContextualSearchNewSettings,
|
||
- ContextualSearchNewSettingsVariations,
|
||
- "ContextualSearchNewSettings")},
|
||
- {"contextual-search-ranker-query",
|
||
- flag_descriptions::kContextualSearchRankerQueryName,
|
||
- flag_descriptions::kContextualSearchRankerQueryDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(assist_ranker::kContextualSearchRankerQuery)},
|
||
- {"contextual-search-twv-impl",
|
||
- flag_descriptions::kContextualSearchThinWebViewImplementationName,
|
||
- flag_descriptions::kContextualSearchThinWebViewImplementationDescription,
|
||
- kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(
|
||
- chrome::android::kContextualSearchThinWebViewImplementation)},
|
||
- {"contextual-search-translations",
|
||
- flag_descriptions::kContextualSearchTranslationsName,
|
||
- flag_descriptions::kContextualSearchTranslationsDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualSearchTranslations)},
|
||
- {"contextual-triggers-selection-handles",
|
||
- flag_descriptions::kContextualTriggersSelectionHandlesName,
|
||
- flag_descriptions::kContextualTriggersSelectionHandlesDescription,
|
||
- kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualTriggersSelectionHandles)},
|
||
- {"contextual-triggers-selection-menu",
|
||
- flag_descriptions::kContextualTriggersSelectionMenuName,
|
||
- flag_descriptions::kContextualTriggersSelectionMenuDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualTriggersSelectionMenu)},
|
||
- {"contextual-triggers-selection-size",
|
||
- flag_descriptions::kContextualTriggersSelectionSizeName,
|
||
- flag_descriptions::kContextualTriggersSelectionSizeDescription, kOsAndroid,
|
||
- FEATURE_VALUE_TYPE(chrome::android::kContextualTriggersSelectionSize)},
|
||
{"explore-sites", flag_descriptions::kExploreSitesName,
|
||
flag_descriptions::kExploreSitesDescription, kOsAndroid,
|
||
FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites,
|
||
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
||
@@ -116,7 +116,6 @@
|
||
#if BUILDFLAG(IS_ANDROID)
|
||
#include "chrome/browser/first_run/android/first_run_prefs.h"
|
||
#include "chrome/browser/lens/android/lens_prefs.h"
|
||
-#include "chrome/browser/search/contextual_search_policy_handler_android.h"
|
||
#else // BUILDFLAG(IS_ANDROID)
|
||
#include "chrome/browser/download/default_download_dir_policy_handler.h"
|
||
#include "chrome/browser/download/download_auto_open_policy_handler.h"
|
||
@@ -1739,10 +1738,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
|
||
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
||
// Policies for all platforms - End
|
||
|
||
-#if BUILDFLAG(IS_ANDROID)
|
||
- handlers->AddHandler(
|
||
- std::make_unique<ContextualSearchPolicyHandlerAndroid>());
|
||
-#else
|
||
+#if !BUILDFLAG(IS_ANDROID)
|
||
handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
|
||
key::kClearBrowsingDataOnExitList,
|
||
browsing_data::prefs::kClearBrowsingDataOnExitList, chrome_schema));
|
||
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||
@@ -789,49 +789,6 @@ CHAR_LIMIT guidelines:
|
||
<message name="IDS_PREFS_PRIVACY_SECURITY" desc="Title for the Privacy and Security preferences. [CHAR_LIMIT=32]">
|
||
Privacy and security
|
||
</message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_TITLE" desc="Name for the Contextual Search feature, which allows users to search for a term in a web page by tapping on it.">
|
||
- Touch to Search
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_TAP_DESCRIPTION" desc="Description for Contextual Search preference">
|
||
- Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Google Search, returning definitions, pictures, search results, and other details.
|
||
-
|
||
-Tap any word to search. To refine your search, touch & hold to select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION" desc="Description for Contextual Search preference">
|
||
- Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Google Search, returning definitions, pictures, search results, and other details.
|
||
-
|
||
-Touch & hold any word to search. To refine your search, select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION_REVISED" desc="Description for Contextual Search preference">
|
||
- Learn about topics on websites without leaving the page. Select one or more words on the page to search for them.
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_SHORT_DESCRIPTION" desc="A promo message shown to users with Touch to Search to explain the new behavior and provide an option to opt in or out">
|
||
- Touch to Search sends the selected word and the current page as context to Google Search. You can turn it off in <ph name="BEGIN_LINK"><link></ph>Settings<ph name="END_LINK"></link></ph>.
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_PROMO_TITLE" desc="The title of the promo message for the contextual search.">
|
||
- Include surrounding text in Google searches?
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_PROMO_DESCRIPTION" desc="A promo message shown to users with Touch to Search to explain the new behavior and provide an option to opt in or out">
|
||
- By including more of a page’s text, you might see better results when using Touch to Search. You can always visit <ph name="BEGIN_LINK"><link></ph>settings<ph name="END_LINK"></link></ph> to change this.
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_INCLUDE_BUTTON" desc="A button to confirm and dismiss opt in promo">
|
||
- Include
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_ALLOW_BUTTON" desc="A button to confirm and dismiss opt out promo">
|
||
- Allow
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_NO_THANKS_BUTTON" desc="A button to confirm and dismiss opt out promo">
|
||
- No thanks
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_DEFAULT_CAPTION" desc="Summary help text that is shown as a second line in the Contextual Search peeking bottom sheet telling the user that they can tap the text in order to open the sheet and see search results there.">
|
||
- Tap to see search results
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_SEE_BETTER_RESULTS_TITLE" desc="Title for the see better results switch in Contextual Search preference.">
|
||
- Include surrounding text in Google searches
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_SEE_BETTER_RESULTS_SUMMARY" desc="Summary for the see better results switch in Contextual Search preference.">
|
||
- By including more of a page’s text, you might see better results
|
||
- </message>
|
||
<message name="IDS_DO_NOT_TRACK_TITLE" desc="Title for 'Do Not Track' preference">
|
||
“Do Not Track”
|
||
</message>
|
||
@@ -3871,41 +3828,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||
Tabs
|
||
</message>
|
||
|
||
- <!-- Contextual Search -->
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_NETWORK_UNAVAILABLE" desc="Tells the user the network is not accessible.">
|
||
- Unable to access the network
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_ERROR" desc="A network error message">
|
||
- Error: <ph name="ERROR_CODE">%1$s<ex>404</ex></ph>
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_OPEN" desc="Caption displayed in the Contextual Search bar prompting the user to open an app related to the selected text e.g. when an address is selected the caption will say 'Open in Maps'.">
|
||
- Open in <ph name="APP_NAME">%1$s<ex>Maps</ex></ph>
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_GENERIC_MAP" desc="Caption displayed in the Contextual Search bar prompting the user to open a maps app with the selected address. This is displayed if more than one app may be used to open the address.">
|
||
- Open in maps app
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_EMAIL" desc="Caption displayed in the Contextual Search bar prompting the user to create an email addressed to the selected email address.">
|
||
- Create email in <ph name="APP_NAME">%1$s<ex>Gmail</ex></ph>
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_GENERIC_EMAIL" desc="Caption displayed in the Contextual Search bar prompting the user to create an email addressed to the selected email address. This is displayed if more than one app may be used to create the email.">
|
||
- Create email
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_EVENT" desc="Caption displayed in the Contextual Search bar prompting the user to create an event using the selected date/time.">
|
||
- Create event in <ph name="APP_NAME">%1$s<ex>Calendar</ex></ph>
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_GENERIC_EVENT" desc="Caption displayed in the Contextual Search bar prompting the user to create an event using the selected date/time. This is displayed if more than one app may be used to create the event.">
|
||
- Create event
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_PHONE" desc="Caption displayed in the Contextual Search bar prompting the user to call the selected phone number.">
|
||
- Call
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_GENERIC_WEBSITE" desc="Caption displayed in the Contextual Search bar prompting the user to navigate to a web page.">
|
||
- Go to page
|
||
- </message>
|
||
- <message name="IDS_CONTEXTUAL_SEARCH_IPH_TAP" desc="An in-product-help message for encouraging users to tap instead of long pressing to trigger the Tap to Search feature.">
|
||
- You can also search with a quick tap on a word
|
||
- </message>
|
||
-
|
||
<!-- Web apps -->
|
||
<message name="IDS_WEBAPP_ACTIVITY_TITLE" desc="Title in recent tasks list for web apps, i.e. web pages that are shown in a separate window">
|
||
Web App
|
||
diff --git a/components/BUILD.gn b/components/BUILD.gn
|
||
--- a/components/BUILD.gn
|
||
+++ b/components/BUILD.gn
|
||
@@ -307,7 +307,6 @@ test("components_unittests") {
|
||
"//components/certificate_transparency:unit_tests",
|
||
"//components/content_capture/browser:unit_tests",
|
||
"//components/content_settings/browser:unit_tests",
|
||
- "//components/contextual_search/core:unit_tests",
|
||
"//components/continuous_search/browser:unit_tests",
|
||
"//components/continuous_search/common:unit_tests",
|
||
"//components/custom_handlers:unit_tests",
|
||
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
|
||
--- a/content/browser/browser_interface_binders.cc
|
||
+++ b/content/browser/browser_interface_binders.cc
|
||
@@ -165,7 +165,6 @@
|
||
#include "content/browser/renderer_host/render_widget_host_view_android.h"
|
||
#include "services/device/public/mojom/nfc.mojom.h"
|
||
#include "third_party/blink/public/mojom/hid/hid.mojom.h"
|
||
-#include "third_party/blink/public/mojom/unhandled_tap_notifier/unhandled_tap_notifier.mojom.h"
|
||
#else // BUILDFLAG(IS_ANDROID)
|
||
#include "content/browser/direct_sockets/direct_sockets_service_impl.h"
|
||
#include "media/mojo/mojom/speech_recognition_service.mojom.h"
|
||
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
|
||
--- a/third_party/blink/public/mojom/BUILD.gn
|
||
+++ b/third_party/blink/public/mojom/BUILD.gn
|
||
@@ -855,8 +855,8 @@ mojom("android_mojo_bindings") {
|
||
# This Android unhandled-tap feature uses another mojo source, add it in.
|
||
if (enable_unhandled_tap) {
|
||
sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
|
||
- public_deps += [ "//ui/gfx/geometry/mojom" ]
|
||
}
|
||
+ public_deps += [ "//ui/gfx/geometry/mojom" ]
|
||
|
||
cpp_typemaps = [
|
||
{
|
||
diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/public/public_features.gni
|
||
--- a/third_party/blink/public/public_features.gni
|
||
+++ b/third_party/blink/public/public_features.gni
|
||
@@ -12,7 +12,7 @@ declare_args() {
|
||
# Unhandled Tap enable means Contextual Search aka Touch to Search.
|
||
# TODO(donnd): remove all unhandled-tap handling after the Long-press experiment
|
||
# is fully launched.
|
||
-enable_unhandled_tap = is_android
|
||
+enable_unhandled_tap = false
|
||
|
||
# Use Minikin hyphenation engine.
|
||
use_minikin_hyphenation = !is_mac
|
||
--
|
||
2.25.1
|