[Android CCT] Rename ActivityTabTaskDescriptionHelper to be CCT-specific

This CL renames ActivityTabTaskDescriptionHelper and
ActivityTaskDescriptionIconGenerator to be CCT specific

BUG=989912
R=pshmakov

TBR=twellington
(as files are being moved from chrome/browser)

Change-Id: I8f07a043663178a26405d26e69ab7dfbf37104bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849943Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Pavel Shmakov <pshmakov@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704497}

chrome/android/chrome_java_sources.gni

@@ -5,8 +5,6 @@
 chrome_java_sources = [
   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
-  "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
-  "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java",
   "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java",
   "java/src/org/chromium/chrome/browser/AppHooks.java",
   "java/src/org/chromium/chrome/browser/AppHooksModule.java",
@@ -393,6 +391,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionIconGenerator.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTopBarDelegate.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsClientFileProcessor.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -33,7 +33,6 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ActivityTabTaskDescriptionHelper;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeFeatureList;
@@ -98,7 +97,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
     @Nullable
     private DynamicModuleCoordinator mDynamicModuleCoordinator;
 
-    private ActivityTabTaskDescriptionHelper mTaskDescriptionHelper;
+    private CustomTabTaskDescriptionHelper mTaskDescriptionHelper;
 
     private CustomTabNightModeStateController mNightModeStateController;
 
@@ -243,7 +242,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
         mConnection.showSignInToastIfNecessary(mSession, getIntent());
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && useSeparateTask()) {
-            mTaskDescriptionHelper = new ActivityTabTaskDescriptionHelper(this,
+            mTaskDescriptionHelper = new CustomTabTaskDescriptionHelper(this,
                     ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color));
         }
 

chrome/android/java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java → chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java

@@ -2,12 +2,13 @@
 // 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;
+package org.chromium.chrome.browser.customtabs;
 
 import android.graphics.Bitmap;
 import android.text.TextUtils;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ -32,12 +33,12 @@ import java.util.List;
  * <p>
  * The task description is what is shown in Android's Overview/Recents screen for each entry.
  */
-public class ActivityTabTaskDescriptionHelper {
+public class CustomTabTaskDescriptionHelper {
     private final int mDefaultThemeColor;
     private final ChromeActivity mActivity;
     private final TabModelSelector mTabModelSelector;
 
-    private final ActivityTaskDescriptionIconGenerator mIconGenerator;
+    private final CustomTabTaskDescriptionIconGenerator mIconGenerator;
     private final FaviconHelper mFaviconHelper;
 
     private final TabModelSelectorObserver mTabModelSelectorObserver;
@@ -53,13 +54,13 @@ public class ActivityTabTaskDescriptionHelper {
      * @param activity The activity whose descriptions should be updated.
      * @param defaultThemeColor The default theme color to be used if the tab does not override it.
      */
-    public ActivityTabTaskDescriptionHelper(ChromeActivity activity, int defaultThemeColor) {
+    public CustomTabTaskDescriptionHelper(ChromeActivity activity, int defaultThemeColor) {
         mActivity = activity;
         mDefaultThemeColor = defaultThemeColor;
 
         mTabModelSelector = mActivity.getTabModelSelector();
 
-        mIconGenerator = new ActivityTaskDescriptionIconGenerator(activity);
+        mIconGenerator = new CustomTabTaskDescriptionIconGenerator(activity);
         mFaviconHelper = new FaviconHelper();
 
         mTabObserver = new EmptyTabObserver() {
@@ -244,8 +245,7 @@ public class ActivityTabTaskDescriptionHelper {
 
             final String currentUrl = mCurrentTab.getUrl();
             mFaviconHelper.getLocalFaviconImageForURL(
-                    mCurrentTab.getProfile(), mCurrentTab.getUrl(), 0,
-                    (image, iconUrl) -> {
+                    mCurrentTab.getProfile(), mCurrentTab.getUrl(), 0, (image, iconUrl) -> {
                         if (mCurrentTab == null
                                 || !TextUtils.equals(currentUrl, mCurrentTab.getUrl())) {
                             return;

chrome/android/java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java → chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionIconGenerator.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.customtabs;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -11,9 +11,9 @@ import android.text.TextUtils;
 import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
 
 /**
- * Generates icons suitable for Activities in the recent tasks list.
+ * Generates icons suitable for Custom Tabs in the recent tasks list.
  */
-public class ActivityTaskDescriptionIconGenerator {
+public class CustomTabTaskDescriptionIconGenerator {
     private static final int APP_ICON_MIN_SIZE_DP = 32;
     private static final int APP_ICON_SIZE_DP = 64;
     private static final int APP_ICON_CORNER_RADIUS_DP = 3;
@@ -38,7 +38,7 @@ public class ActivityTaskDescriptionIconGenerator {
      */
     private RoundedIconGenerator mGenerator;
 
-    public ActivityTaskDescriptionIconGenerator(Context context) {
+    public CustomTabTaskDescriptionIconGenerator(Context context) {
         mContext = context;
         mMinSizePx =
                 (int) mContext.getResources().getDisplayMetrics().density * APP_ICON_MIN_SIZE_DP;