Upstream hooks for FindResultListener and FindMatchListener

Moves them from downstream ChromeTab directly to ChromeWebContentsDelegateAndroid
which was already forwarding the calls.
BUG=443773,332413

Review URL: https://codereview.chromium.org/1007513005

Cr-Commit-Position: refs/heads/master@{#320500}

2 files changed, 39 insertions, 4 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java
index a162c9e..381813d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java
@@ -19,12 +19,47 @@ import org.chromium.content_public.browser.WebContents;
  */
 public class ChromeWebContentsDelegateAndroid extends WebContentsDelegateAndroid {
 
+    private FindResultListener mFindResultListener;
+
+
+    private FindMatchRectsListener mFindMatchRectsListener = null;
+
+    /**
+     * Listener to be notified when a find result is received.
+     */
+    public interface FindResultListener {
+        public void onFindResult(FindNotificationDetails result);
+    }
+
+    /**
+     * Listener to be notified when the rects corresponding to find matches are received.
+     */
+    public interface FindMatchRectsListener {
+        public void onFindMatchRects(FindMatchRectsDetails result);
+    }
+
     @CalledByNative
-    public void onFindResultAvailable(FindNotificationDetails result) {
+    private void onFindResultAvailable(FindNotificationDetails result) {
+        if (mFindResultListener != null) {
+            mFindResultListener.onFindResult(result);
+        }
     }
 
     @CalledByNative
-    public void onFindMatchRectsAvailable(FindMatchRectsDetails result) {
+    private void onFindMatchRectsAvailable(FindMatchRectsDetails result) {
+        if (mFindMatchRectsListener != null) {
+            mFindMatchRectsListener.onFindMatchRects(result);
+        }
+    }
+
+    /** Register to receive the results of startFinding calls. */
+    public void setFindResultListener(FindResultListener listener) {
+        mFindResultListener = listener;
+    }
+
+    /** Register to receive the results of requestFindMatchRects calls. */
+    public void setFindMatchRectsListener(FindMatchRectsListener listener) {
+        mFindMatchRectsListener = listener;
     }
 
     @CalledByNative
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index f2c679d..2ce12cc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -2051,9 +2051,9 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
-     * @return The current {@link TabChromeWebContentsDelegateAndroid} instance.
+     * @return The current {@link ChromeWebContentsDelegateAndroid} instance.
      */
-    protected TabChromeWebContentsDelegateAndroid getChromeWebContentsDelegateAndroid() {
+    public ChromeWebContentsDelegateAndroid getChromeWebContentsDelegateAndroid() {
         return mWebContentsDelegate;
     }