Show the image header for the Context Menu

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
index dbb62b1694e5b2f51452d42dbae5dffa2134433f..c2ef11f0af8eb82eb97f01f2ebfbf7c85b20f4a0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
@@ -6,6 +6,8 @@ package org.chromium.chrome.browser.contextmenu;
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.util.Pair;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -16,6 +18,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.content.browser.ContentViewCore;
@@ -37,6 +40,22 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
     private Callback<Integer> mCallback;
     private Runnable mOnMenuShown;
     private Runnable mOnMenuClosed;
+    private OnThumbnailReceivedListener mOnThumbnailReceivedListener;
+
+    /**
+     * This waits for a thumbnail to be retrieved by the native code.
+     */
+    interface OnThumbnailReceivedListener {

[Ted C, 2017/03/31 16:19:32]

FWIW, you can just use Callback.java from base/ to make these single value
callback a bit easier to define.

[JJ, 2017/03/31 18:43:59]

Done.

+        /**
+         * When the thumbnail is received it will send the thumbnail via this method. This is
+         * activated after calling {@link #getThumbnail(OnThumbnailReceivedListener)}.
+         * @param bitmap The bitmap that is retrieved from native code.
+         */
+        void onThumbnailReceived(Bitmap bitmap);
+    }
+
+    @VisibleForTesting
+    ContextMenuHelper() {}
 
     private ContextMenuHelper(long nativeContextMenuHelper) {
         mNativeContextMenuHelper = nativeContextMenuHelper;
@@ -108,7 +127,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
             List<Pair<Integer, List<ContextMenuItem>>> items =
                     mPopulator.buildContextMenu(null, mContext, mCurrentContextMenuParams);
 
-            ContextMenuUi menuUi = new TabularContextMenuUi();
+            ContextMenuUi menuUi = new TabularContextMenuUi(this);
             menuUi.displayMenu(mContext, mCurrentContextMenuParams, items, mCallback, mOnMenuShown,
                     mOnMenuClosed);

[Ted C, 2017/03/31 16:19:33]

from my comment in the other file, I think we should do:

final TabularContextMenuUi menuUi = new TabularContextMenuUi(this);
...
if (mCurrentContextMenuParams.isImage()) {
    getThumbnail(new Callback<Bitmap>() {
        @Override
        public void call(Bitmap bitmap) {
            menuUi.onImageThumbnailRetreived(bitmap);
        }
    });
}

Then you don't need to pass in the helper.

[JJ, 2017/03/31 18:43:59]

Done.

             return;
@@ -164,6 +183,26 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
         ShareHelper.shareImage(activity, jpegImageData);
     }
 
+    /**
+     * Gets the thumbnail of the current image that triggered the context menu.
+     * @param listener Called once the the thumbnail is received
+     */
+    public void getThumbnail(final OnThumbnailReceivedListener listener) {
+        mOnThumbnailReceivedListener = listener;
+        if (mNativeContextMenuHelper == 0) return;
+        int maxSizePx = mContext.getResources().getDimensionPixelSize(
+                R.dimen.context_menu_header_image_max_size);
+        nativeRetrieveHeaderThumbnail(mNativeContextMenuHelper, maxSizePx);
+    }
+
+    @CalledByNative
+    private void onHeaderThumbnailReceived(WindowAndroid windowAndroid, byte[] jpegImageData) {
+        Bitmap bitmap = BitmapFactory.decodeByteArray(jpegImageData, 0, jpegImageData.length);

[Ted C, 2017/03/31 16:19:33]

Can you add another:

// TODO(tedchoc): Decode in separate process before launch.

Here we are receiving image data from the renderer, which is inherently
untrusted, so we can't decode in the browser process safely.  I think we can
either use a separate java process or the utility process.

[JJ, 2017/03/31 18:43:59]

Done.

+        if (mOnThumbnailReceivedListener != null) {
+            mOnThumbnailReceivedListener.onThumbnailReceived(bitmap);
+        }
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         List<Pair<Integer, List<ContextMenuItem>>> items =
@@ -186,4 +225,5 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
     private native void nativeSearchForImage(long nativeContextMenuHelper);
     private native void nativeShareImage(long nativeContextMenuHelper);
     private native void nativeOnContextMenuClosed(long nativeContextMenuHelper);
+    private native void nativeRetrieveHeaderThumbnail(long nativeContextMenuHelper, int maxSizePx);
 }