Remove the print option from the menu and make it a share destination.

chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java

 // Copyright 2014 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.share;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ skipping 41 matching lines @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
  * A helper class that helps to start an intent to share titles and URLs.
  */
 public class ShareHelper {
 
     private static final String TAG = "share";
 
+    /** The task ID of the activity that triggered the share action. */
+    public static final String EXTRA_TASK_ID = "org.chromium.chrome.extra.TASK_ID";
+
     private static final String JPEG_EXTENSION = ".jpg";
     private static final String PACKAGE_NAME_KEY = "last_shared_package_name";
     private static final String CLASS_NAME_KEY = "last_shared_class_name";
     private static final String EXTRA_SHARE_SCREENSHOT_AS_STREAM = "share_screenshot_as_stream";
     private static final long COMPONENT_INFO_READ_TIMEOUT_IN_MS = 1000;
 
     /**
      * Directory name for shared images.
      *
      * Named "screenshot" for historical reasons as we only initially shared screenshot images.
@@ skipping 61 matching lines @@
                 context.getApplicationContext().unregisterReceiver(sLastRegisteredReceiver);
                 sLastRegisteredReceiver = null;
             }
             if (!intent.hasExtra(EXTRA_RECEIVER_TOKEN)
                     || intent.getIntExtra(EXTRA_RECEIVER_TOKEN, 0) != this.hashCode()) {
                 return;
             }
 
             ComponentName target = intent.getParcelableExtra(Intent.EXTRA_CHOSEN_COMPONENT);
             if (target != null) {
-                setLastShareComponentName(context, target);
+                setLastShareComponentName(target);
             }
         }
     }
 
     /**
      * Clears all shared image files.
      */
     public static void clearSharedImages(final Context context) {
         new AsyncTask<Void, Void, Void>() {
             @Override
@@ skipping 98 matching lines @@
     /**
      * Creates and shows a share intent picker dialog.
      *
      * @param activity Activity that is used to access package manager.
      * @param title Title of the page to be shared.
      * @param url URL of the page to be shared.
      * @param screenshot Screenshot of the page to be shared.
      */
     private static void showShareDialog(final Activity activity, final String title,
             final String url, final Bitmap screenshot) {
-        Intent intent = getShareIntent(title, url, null);
+        Intent intent = getShareIntent(activity, title, url, null);
         PackageManager manager = activity.getPackageManager();
         List<ResolveInfo> resolveInfoList = manager.queryIntentActivities(intent, 0);
         assert resolveInfoList.size() > 0;
         if (resolveInfoList.size() == 0) return;
         Collections.sort(resolveInfoList, new ResolveInfo.DisplayNameComparator(manager));
 
         final ShareDialogAdapter adapter =
                 new ShareDialogAdapter(activity, manager, resolveInfoList);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.AlertDialogTheme);
         builder.setTitle(activity.getString(R.string.share_link_chooser_title));
         builder.setAdapter(adapter, null);
 
         final AlertDialog dialog = builder.create();
         dialog.show();
         dialog.getListView().setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 ResolveInfo info = adapter.getItem(position);
                 ActivityInfo ai = info.activityInfo;
                 ComponentName component =
                         new ComponentName(ai.applicationInfo.packageName, ai.name);
-                setLastShareComponentName(activity, component);
+                setLastShareComponentName(component);
                 makeIntentAndShare(activity, title, url, screenshot, component);
                 dialog.dismiss();
             }
         });
     }
 
     /**
      * Starts a share intent with the activity that was most recently used to share.
      * If there is no most recently used activity, it does nothing.
      * @param activity Activity that is used to start the share intent.
      * @param title Title of the page to be shared.
      * @param url URL of the page to be shared.
      * @param screenshot Screenshot of the page to be shared.
      */
     private static void shareWithLastUsed(
             Activity activity, String title, String url, Bitmap screenshot) {
-        ComponentName component = getLastShareComponentName(activity);
+        ComponentName component = getLastShareComponentName();
         if (component == null) return;
         makeIntentAndShare(activity, title, url, screenshot, component);
     }
 
     private static void shareIntent(Activity activity, Intent sharingIntent) {
         if (sharingIntent.getComponent() != null) {
             activity.startActivity(sharingIntent);
         } else {
             assert TargetChosenReceiver.isSupported();
             TargetChosenReceiver.sendChooserIntent(activity, sharingIntent);
         }
     }
 
     private static void makeIntentAndShare(final Activity activity, final String title,
             final String url, final Bitmap screenshot, final ComponentName component) {
         if (screenshot == null) {
-            shareIntent(activity, getDirectShareIntentForComponent(title, url, null, component));
+            shareIntent(activity,
+                    getDirectShareIntentForComponent(activity, title, url, null, component));
         } else {
             new AsyncTask<Void, Void, File>() {
                 @Override
                 protected File doInBackground(Void... params) {
                     FileOutputStream fOut = null;
                     try {
                         File path = new File(UiUtils.getDirectoryForImageCapture(activity),
                                 SHARE_IMAGES_DIRECTORY_NAME);
                         if (path.exists() || path.mkdir()) {
                             File saveFile = File.createTempFile(
@@ skipping 19 matching lines @@
                     return null;
                 }
 
                 @Override
                 protected void onPostExecute(File saveFile) {
                     if (ApplicationStatus.getStateForApplication()
                             != ApplicationState.HAS_DESTROYED_ACTIVITIES) {
                         Uri screenshotUri = saveFile == null
                                 ? null : UiUtils.getUriForImageCaptureFile(activity, saveFile);
                         shareIntent(activity, getDirectShareIntentForComponent(
-                                title, url, screenshotUri, component));
+                                activity, title, url, screenshotUri, component));
                     }
                 }
             }.execute();
         }
     }
 
     /**
      * Set the icon and the title for the menu item used for direct share.
      *
      * @param activity Activity that is used to access the package manager.
      * @param item The menu item that is used for direct share
      */
     public static void configureDirectShareMenuItem(Activity activity, MenuItem item) {
         Drawable directShareIcon = null;
         CharSequence directShareTitle = null;
 
-        final ComponentName component = getLastShareComponentName(activity);
+        final ComponentName component = getLastShareComponentName();
         boolean isComponentValid = false;
         if (component != null) {
-            Intent intent = getShareIntent("", "", null);
+            Intent intent = getShareIntent(activity, "", "", null);
             intent.setPackage(component.getPackageName());
             PackageManager manager = activity.getPackageManager();
             List<ResolveInfo> resolveInfoList = manager.queryIntentActivities(intent, 0);
             for (ResolveInfo info : resolveInfoList) {
                 ActivityInfo ai = info.activityInfo;
                 if (component.equals(new ComponentName(ai.applicationInfo.packageName, ai.name))) {
                     isComponentValid = true;
                     break;
                 }
             }
@@ skipping 38 matching lines @@
         }
 
         item.setIcon(directShareIcon);
         if (directShareTitle != null) {
             item.setTitle(activity.getString(R.string.accessibility_menu_share_via,
                     directShareTitle));
         }
     }
 
     @VisibleForTesting
-    public static Intent getShareIntent(String title, String url, Uri screenshotUri) {
+    protected static Intent getShareIntent(
+            Activity activity, String title, String url, Uri screenshotUri) {
         url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.addFlags(ApiCompatibilityUtils.getActivityNewDocumentFlag());
         intent.setType("text/plain");
         intent.putExtra(Intent.EXTRA_SUBJECT, title);
         intent.putExtra(Intent.EXTRA_TEXT, url);
+        intent.putExtra(EXTRA_TASK_ID, activity.getTaskId());
+
         if (screenshotUri != null) {
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             // To give read access to an Intent target, we need to put |screenshotUri| in clipData
             // because adding Intent.FLAG_GRANT_READ_URI_PERMISSION doesn't work for
             // EXTRA_SHARE_SCREENSHOT_AS_STREAM.
             intent.setClipData(ClipData.newRawUri("", screenshotUri));
             intent.putExtra(EXTRA_SHARE_SCREENSHOT_AS_STREAM, screenshotUri);
         }
         return intent;
     }
 
     private static Intent getShareImageIntent(Uri imageUri) {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.addFlags(ApiCompatibilityUtils.getActivityNewDocumentFlag());
         intent.setType("image/jpeg");
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         intent.putExtra(Intent.EXTRA_STREAM, imageUri);
         return intent;
     }
 
     private static Intent getDirectShareIntentForComponent(
-            String title, String url, Uri screenshotUri, ComponentName component) {
-        Intent intent = getShareIntent(title, url, screenshotUri);
+            Activity activity, String title, String url,
+            Uri screenshotUri, ComponentName component) {
+        Intent intent = getShareIntent(activity, title, url, screenshotUri);
         intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
                 | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
         intent.setComponent(component);
         return intent;
     }
 
-    private static ComponentName getLastShareComponentName(Context context) {
+    private static ComponentName getLastShareComponentName() {
         SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
         String packageName = preferences.getString(PACKAGE_NAME_KEY, null);
         String className = preferences.getString(CLASS_NAME_KEY, null);
         if (packageName == null || className == null) return null;
         return new ComponentName(packageName, className);
     }
 
-    private static void setLastShareComponentName(Context context, ComponentName component) {
+    private static void setLastShareComponentName(ComponentName component) {
         SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
         SharedPreferences.Editor editor = preferences.edit();
         editor.putString(PACKAGE_NAME_KEY, component.getPackageName());
         editor.putString(CLASS_NAME_KEY, component.getClassName());
         editor.apply();
     }
 }