[Android] Open a tab in the background from Browser Actions if ChromeTabbedActivity is available

chrome/android/java/src/org/chromium/chrome/browser/browseractions/BrowserActionsContextMenuHelper.java

 // 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.
 
 package org.chromium.chrome.browser.browseractions;
 
 import android.app.PendingIntent;
+import android.app.ProgressDialog;
 import android.support.customtabs.browseractions.BrowserActionItem;
 import android.support.customtabs.browseractions.BrowserActionsIntent;
 import android.util.Pair;
 import android.util.SparseArray;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View;
 import android.view.View.OnAttachStateChangeListener;
 import android.view.View.OnCreateContextMenuListener;
 
@@ skipping 34 matching lines @@
     private final ContextMenuParams mCurrentContextMenuParams;
     private final BrowserActionsContextMenuItemDelegate mDelegate;
     private final BrowserActionActivity mActivity;
     private final Callback<Integer> mItemSelectedCallback;
     private final Runnable mOnMenuShown;
     private final Runnable mOnMenuClosed;
     private final Callback<Boolean> mOnShareClickedRunnable;
 
     private final List<Pair<Integer, List<ContextMenuItem>>> mItems;
 
+    private final ProgressDialog mProgressDialog;
+
+    private boolean mIsOpenInBackgroundPending;
+
     public BrowserActionsContextMenuHelper(BrowserActionActivity activity, ContextMenuParams params,

[Yusuf, 2017/07/10 06:14:56]

Looking at how we are using the Activity here, if we had a public interface
defined here as a MenuShownListener and moved onMenuShown there, then from the
Activity side we can still pass it in both params, but here we can just set the
activity to be a plain Activity instead of BrowserActionsActivity.

[ltian, 2017/07/26 01:22:12]

Done.

             List<BrowserActionItem> customItems, String sourcePackageName) {
         mActivity = activity;
         mCurrentContextMenuParams = params;
         mOnMenuShown = new Runnable() {
             @Override
             public void run() {
                 mActivity.onMenuShown();
             }
         };
         mOnMenuClosed = new Runnable() {
             @Override
             public void run() {
-                mActivity.finish();
+                if (!mIsOpenInBackgroundPending) {
+                    mActivity.finish();
+                }
             }
         };
         mItemSelectedCallback = new Callback<Integer>() {
             @Override
             public void onResult(Integer result) {
                 onItemSelected(result);
             }
         };
         mOnShareClickedRunnable = new Callback<Boolean>() {
             @Override
             public void onResult(Boolean isShareLink) {
                 mDelegate.share(true, mCurrentContextMenuParams.getLinkUrl());
             }
         };
         ShareContextMenuItem shareItem = new ShareContextMenuItem(R.drawable.ic_share_white_24dp,
                 R.string.browser_actions_share, R.id.browser_actions_share, true);
         shareItem.setCreatorPackageName(sourcePackageName);
         mBrowserActionsLinkGroup =
                 Arrays.asList(ChromeContextMenuItem.BROWSER_ACTIONS_OPEN_IN_BACKGROUND,
                         ChromeContextMenuItem.BROWSER_ACTIONS_OPEN_IN_INCOGNITO_TAB,
                         ChromeContextMenuItem.BROWSER_ACTION_SAVE_LINK_AS,
                         ChromeContextMenuItem.BROWSER_ACTIONS_COPY_ADDRESS, shareItem);
         mDelegate = new BrowserActionsContextMenuItemDelegate(mActivity, sourcePackageName);
+        mProgressDialog = new ProgressDialog(mActivity);
 
         mItems = buildContextMenuItems(customItems);
     }
 
     /**
      * Builds items for Browser Actions context menu.
      */
     private List<Pair<Integer, List<ContextMenuItem>>> buildContextMenuItems(
             List<BrowserActionItem> customItems) {
         List<Pair<Integer, List<ContextMenuItem>>> menuItems = new ArrayList<>();
@@ skipping 15 matching lines @@
         for (int i = 0; i < customItems.size() && i < BrowserActionsIntent.MAX_CUSTOM_ITEMS; i++) {
             items.add(new BrowserActionsCustomContextMenuItem(
                     CUSTOM_BROWSER_ACTIONS_ID_GROUP.get(i), customItems.get(i)));
             mCustomItemActionMap.put(
                     CUSTOM_BROWSER_ACTIONS_ID_GROUP.get(i), customItems.get(i).getAction());
         }
     }
 
     private boolean onItemSelected(int itemId) {
         if (itemId == R.id.browser_actions_open_in_background) {
-            mDelegate.onOpenInBackground(mCurrentContextMenuParams.getLinkUrl());
+            if (mActivity.isNativeInitialized()) {
+                mDelegate.onOpenInBackground(mCurrentContextMenuParams.getLinkUrl());
+            } else {
+                mIsOpenInBackgroundPending = true;
+                waitNativeInitialized();
+            }
         } else if (itemId == R.id.browser_actions_open_in_incognito_tab) {
             mDelegate.onOpenInIncognitoTab(mCurrentContextMenuParams.getLinkUrl());
         } else if (itemId == R.id.browser_actions_save_link_as) {
             mDelegate.startDownload(mCurrentContextMenuParams.getLinkUrl());
         } else if (itemId == R.id.browser_actions_copy_address) {
             mDelegate.onSaveToClipboard(mCurrentContextMenuParams.getLinkUrl());
         } else if (itemId == R.id.browser_actions_share) {
             mDelegate.share(false, mCurrentContextMenuParams.getLinkUrl());
         } else if (mCustomItemActionMap.indexOfKey(itemId) >= 0) {
             mDelegate.onCustomItemSelected(mCustomItemActionMap.get(itemId));
         }
         return true;
     }
 
     /**
+     * Display a progress dialog to wait for native libraries initialized.
+     */
+    private void waitNativeInitialized() {
+        mProgressDialog.setMessage(
+                mActivity.getString(R.string.browser_actions_loading_native_message));
+        mProgressDialog.show();
+    }
+
+    private void dismissProgressDialog() {
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.dismiss();
+        }
+    }
+
+    /**
      * Displays the Browser Actions context menu.
      * @param view The view to show the context menu if old UI is used.
      */
     public void displayBrowserActionsMenu(final View view) {
         if (IS_NEW_UI_ENABLED) {
             ContextMenuUi menuUi = new TabularContextMenuUi(mOnShareClickedRunnable);
             menuUi.displayMenu(mActivity, mCurrentContextMenuParams, mItems, mItemSelectedCallback,
                     mOnMenuShown, mOnMenuClosed);
         } else {
             view.setOnCreateContextMenuListener(BrowserActionsContextMenuHelper.this);
@@ skipping 16 matching lines @@
 
     @Override
     public void onViewAttachedToWindow(View view) {
         if (view.showContextMenu()) {
             mOnMenuShown.run();
         }
     }
 
     @Override
     public void onViewDetachedFromWindow(View v) {}
+
+    /**
+     * Finishes all pending actions which requires Chrome native libraries.
+     */
+    public void handlePendingActions() {

[Yusuf, 2017/07/10 06:14:56]

onNativeInitialized

[ltian, 2017/07/26 01:22:12]

Done.

+        if (mIsOpenInBackgroundPending) {
+            mIsOpenInBackgroundPending = false;
+            dismissProgressDialog();
+            mDelegate.onOpenInBackground(mCurrentContextMenuParams.getLinkUrl());
+            mActivity.finish();
+        }
+    }
 }