[Screnshot] pass callback to share intent downstream

This also workarounds for the fact that the share code is not
modularized (crbug.com/1022172) by adding a small build target with just
one interface.

Bug: 1093365
Change-Id: I8a7e23f90de190756e10ff37ce8a90340e3b565c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288076
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Kristi Park <kristipark@chromium.org>
Reviewed-by: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787838}

chrome/android/BUILD.gn

@@ -326,6 +326,7 @@ android_library("chrome_java") {
     "//chrome/browser/safe_browsing/android:java",
     "//chrome/browser/safety_check/android:java",
     "//chrome/browser/settings:java",
+    "//chrome/browser/share:java",
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
@@ -788,6 +789,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/safety_check/android:java",
     "//chrome/browser/safety_check/android:junit",
+    "//chrome/browser/share:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/thumbnail:java",
@@ -974,6 +976,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/settings:java",
     "//chrome/browser/settings:javatests",
     "//chrome/browser/settings:test_support_java",
+    "//chrome/browser/share:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/tabpersistence:java",

chrome/android/chrome_java_sources.gni

@@ -1373,7 +1373,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/MainSettings.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java",
-  "java/src/org/chromium/chrome/browser/share/ChromeShareExtras.java",
   "java/src/org/chromium/chrome/browser/share/LensUtils.java",
   "java/src/org/chromium/chrome/browser/share/OptionalShareTargetsManager.java",
   "java/src/org/chromium/chrome/browser/share/ShareButtonController.java",

chrome/android/features/tab_ui/BUILD.gn

@@ -189,6 +189,7 @@ android_library("java") {
     "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/share:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/ui/android/favicon:java",

chrome/android/java/src/org/chromium/chrome/browser/share/OWNERS

 dtrainor@chromium.org
 
-per-file ChromeProvidedSharingOptionsProvider.java=file://components/send_tab_to_self/OWNERS
-per-file ChromeShareExtras.java=file://components/send_tab_to_self/OWNERS
-per-file ShareSheet*=file://components/send_tab_to_self/OWNERS
 per-file ShareDelegate*=file://components/send_tab_to_self/OWNERS
 per-file ShareButtonController*=file://components/send_tab_to_self/OWNERS
 

chrome/browser/image_editor/internal/android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java

@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.image_editor;
 import android.app.Activity;
 import android.graphics.Bitmap;
 
+import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
@@ -15,5 +16,6 @@ import org.chromium.chrome.browser.tab.Tab;
  */
 public class ImageEditorDialogCoordinatorImpl implements ImageEditorDialogCoordinator {
     @Override
-    public void launchEditor(Activity activity, Bitmap image, Tab mTab) {}
+    public void launchEditor(Activity activity, Bitmap image, Tab tab,
+            ChromeOptionShareCallback chromeOptionShareCallback) {}
 }

chrome/browser/image_editor/public/BUILD.gn

@@ -8,6 +8,7 @@ android_library("java") {
   sources = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinator.java" ]
 
   deps = [
+    "//chrome/browser/share:java",
     "//chrome/browser/tab:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
   ]

chrome/browser/image_editor/public/android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinator.java

@@ -7,11 +7,13 @@ package org.chromium.chrome.browser.image_editor;
 import android.app.Activity;
 import android.graphics.Bitmap;
 
+import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
  * Interface to interact with the image editor dialog.
  */
 public interface ImageEditorDialogCoordinator {
-    public void launchEditor(Activity activity, Bitmap image, Tab mTab);
+    public void launchEditor(Activity activity, Bitmap image, Tab mTab,
+            ChromeOptionShareCallback chromeOptionShareCallback);
 }

chrome/browser/share/BUILD.gn

@@ -2,6 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+import("//chrome/browser/buildflags.gni")
+
 source_set("share") {
   sources = [
     "bitmap_download_request.cc",
@@ -18,3 +22,12 @@ source_set("share") {
     "//skia",
   ]
 }
+
+android_library("java") {
+  sources = [
+    "android/java/src/org/chromium/chrome/browser/share/ChromeShareExtras.java",
+    "android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeOptionShareCallback.java",
+  ]
+
+  deps = [ "//components/browser_ui/share/android:java" ]
+}

chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java

@@ -74,7 +74,7 @@ public class ScreenshotCoordinator {
     private void launchEditor() {
         ImageEditorDialogCoordinator editor = ImageEditorModuleProvider.getImageEditorProvider()
                                                       .getImageEditorDialogCoordinator();
-        editor.launchEditor(mActivity, mScreenshot, mTab);
+        editor.launchEditor(mActivity, mScreenshot, mTab, mChromeOptionShareCallback);
         mScreenshot = null;
     }
 

chrome/browser/share/android/java_sources.gni

@@ -34,7 +34,6 @@ share_java_sources = [
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetView.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewBinder.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewProperties.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeOptionShareCallback.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java",
   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetCoordinator.java",