Hide PopupZoomer when the container view or window loses focus

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index aebda91e321f592e556799e3420e4d064a3ef890..a2c0a3987f3888d1920e46bf2c148f7225d22259 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -754,6 +754,11 @@ public class ContentViewCore
         mPopupZoomer.setOnTapListener(listener);
     }
 
+    @VisibleForTesting
+    public void setPopupZoomerForTest(PopupZoomer popupZoomer) {
+        mPopupZoomer = popupZoomer;
+    }
+
     /**
      * Destroy the internal state of the ContentView. This method may only be
      * called after the ContentView has been removed from the view system. No
@@ -1442,6 +1447,7 @@ public class ContentViewCore
         hidePastePopup();
         hideSelectPopup();
         hideTextHandles();
+        mPopupZoomer.hide(false);
     }
 
     public void hideSelectActionBar() {
@@ -1643,8 +1649,7 @@ public class ContentViewCore
         if (!gainFocus) {
             hideImeIfNeeded();
             cancelRequestToScrollFocusedEditableNodeIntoView();
-            hidePastePopup();
-            hideTextHandles();
+            hidePopups();

[jdduke (slow), 2014/08/20 15:47:46]

Will a select popup and/or action bar action cause the focus to change? This
change doesn't seem completely necessary to me, unless you're seeing that the
zoomer continues to steal focus after the focus change event.

[raghu, 2014/08/21 06:23:59]

No, they are not causing the focus to change. But anyways I have now changed it
to just hide the zoomer 

         }
         if (mNativeContentViewCore != 0) nativeSetFocus(mNativeContentViewCore, gainFocus);
     }