Merge pull request #1925 from nikolowry/master

Fix for contextual search manager removal patch
This commit is contained in:
Carl 2022-03-26 16:20:26 +01:00 committed by GitHub
commit 8066120fa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,9 +47,10 @@ Subject: Remove contextual search manager
...nfiguration_policy_handler_list_factory.cc | 6 +-
.../strings/android_chrome_strings.grd | 49 ----------
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 +-
46 files changed, 17 insertions(+), 855 deletions(-)
47 files changed, 17 insertions(+), 856 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
@ -1750,6 +1751,17 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
"//components/continuous_search/browser:unit_tests",
"//components/continuous_search/common:unit_tests",
"//components/data_use_measurement/core: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
@@ -160,7 +160,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