[Screenshotz] Restructure the ImageEditor boilerplate

ImageEditorCoordinator will be renamed to ImageEditorDialogCoordinator
and will be used to create the editor DialogFragment
(ImageEditorCoordinator is used internally by the DialogFragment).

Bug: 1024586
Change-Id: I29822893395022bdb661f535d87dbac35757b4d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975110Reviewed-by: Jeffrey Cohen <jeffreycohen@chromium.org>
Commit-Queue: Kristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726623}

chrome/android/modules/image_editor/internal/java/src/org/chromium/chrome/modules/image_editor/ImageEditorProviderImpl.java

@@ -4,11 +4,9 @@
 
 package org.chromium.chrome.modules.image_editor;
 
-import android.app.Activity;
-
 import org.chromium.base.annotations.UsedByReflection;
-import org.chromium.chrome.browser.image_editor.ImageEditorCoordinator;
-import org.chromium.chrome.browser.image_editor.ImageEditorCoordinatorImpl;
+import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator;
+import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinatorImpl;
 
 /**
  * Upstream implementation for DFM module hook. Does nothing. Actual implementation lives
@@ -17,7 +15,7 @@ import org.chromium.chrome.browser.image_editor.ImageEditorCoordinatorImpl;
 @UsedByReflection("ImageEditorModule")
 public class ImageEditorProviderImpl implements ImageEditorProvider {
     @Override
-    public ImageEditorCoordinator getImageEditorCoordinator(Activity activity) {
-        return new ImageEditorCoordinatorImpl(activity);
+    public ImageEditorDialogCoordinator getImageEditorDialogCoordinator() {
+        return new ImageEditorDialogCoordinatorImpl();
     }
 }

chrome/android/modules/image_editor/public/java/src/org/chromium/chrome/modules/image_editor/ImageEditorProvider.java

@@ -4,19 +4,17 @@
 
 package org.chromium.chrome.modules.image_editor;
 
-import android.app.Activity;
-
-import org.chromium.chrome.browser.image_editor.ImageEditorCoordinator;
+import org.chromium.chrome.browser.image_editor.ImageEditorDialogCoordinator;
 import org.chromium.components.module_installer.builder.ModuleInterface;
 
 /**
- * Interface to get access to the image editor activity.
+ * Interface to get access to the image editor dialog.
  */
 @ModuleInterface(module = "image_editor",
         impl = "org.chromium.chrome.modules.image_editor.ImageEditorProviderImpl")
 public interface ImageEditorProvider {
     /**
-     * Creates and returns the instance tied to the image editor activity.
+     * Creates and returns the instance tied to the image editor dialog.
      */
-    ImageEditorCoordinator getImageEditorCoordinator(Activity activity);
+    ImageEditorDialogCoordinator getImageEditorDialogCoordinator();
 }

chrome/browser/image_editor/internal/BUILD.gn

@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
 # Upstream ImageEditor implementation which does nothing. Actual implementation
 # lives downstream.
 android_library("java") {
-  java_files = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorCoordinatorImpl.java" ]
+  java_files = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java" ]
 
   deps = [
     "//chrome/browser/image_editor/public:java",

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

+// Copyright 2019 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.image_editor;
+
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Upstream implementation for ImageEditorDialogCoordinator. Does nothing. Actual implementation
+ * lives downstream.
+ */
+public class ImageEditorDialogCoordinatorImpl implements ImageEditorDialogCoordinator {
+    @Override
+    public void launchEditor(AppCompatActivity activity) {}
+}

chrome/browser/image_editor/public/BUILD.gn

@@ -5,5 +5,12 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorCoordinator.java" ]
+  java_files = [
+    "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorCoordinator.java",
+    "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinator.java",
+  ]
+
+  deps = [
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+  ]
 }

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

@@ -4,12 +4,11 @@
 
 package org.chromium.chrome.browser.image_editor;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 
 /**
- * Upstream implementation for ImageEditorCoordinator. Does nothing. Actual implementation lives
- * downstream.
+ * Interface to interact with the image editor dialog.
  */
-public class ImageEditorCoordinatorImpl implements ImageEditorCoordinator {
-    public ImageEditorCoordinatorImpl(Activity activity) {}
+public interface ImageEditorDialogCoordinator {
+    public void launchEditor(AppCompatActivity activity);
 }