[Signin][Modularization] Move SigninPromoController to signin.ui module

This CL moves SigninPromoController to signin.ui module.

Bug: 1159833
Change-Id: I2a65cf55b81cd928c8b93dc21fd61729560c0fd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2598913Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840960}

chrome/android/chrome_java_resources.gni

@@ -46,7 +46,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-hdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-hdpi/btn_toolbar_reload.png",
-  "java/res/drawable-hdpi/chrome_sync_logo.png",
   "java/res/drawable-hdpi/contextual_search_promo_ripple.9.png",
   "java/res/drawable-hdpi/cvc_icon.png",
   "java/res/drawable-hdpi/cvc_icon_amex.png",
@@ -183,7 +182,6 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-mdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-mdpi/btn_toolbar_reload.png",
-  "java/res/drawable-mdpi/chrome_sync_logo.png",
   "java/res/drawable-mdpi/contextual_search_promo_ripple.9.png",
   "java/res/drawable-mdpi/cvc_icon.png",
   "java/res/drawable-mdpi/cvc_icon_amex.png",
@@ -309,7 +307,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xhdpi/btn_toolbar_reload.png",
-  "java/res/drawable-xhdpi/chrome_sync_logo.png",
   "java/res/drawable-xhdpi/contextual_search_promo_ripple.9.png",
   "java/res/drawable-xhdpi/cvc_icon.png",
   "java/res/drawable-xhdpi/cvc_icon_amex.png",
@@ -413,7 +410,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xxhdpi/btn_toolbar_reload.png",
-  "java/res/drawable-xxhdpi/chrome_sync_logo.png",
   "java/res/drawable-xxhdpi/contextual_search_promo_ripple.9.png",
   "java/res/drawable-xxhdpi/cvc_icon.png",
   "java/res/drawable-xxhdpi/cvc_icon_amex.png",
@@ -516,7 +512,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png",
   "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xxxhdpi/btn_toolbar_reload.png",
-  "java/res/drawable-xxxhdpi/chrome_sync_logo.png",
   "java/res/drawable-xxxhdpi/contextual_search_promo_ripple.9.png",
   "java/res/drawable-xxxhdpi/cvc_icon.png",
   "java/res/drawable-xxxhdpi/cvc_icon_amex.png",

chrome/android/chrome_java_sources.gni

@@ -1248,7 +1248,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java",
   "java/src/org/chromium/chrome/browser/signin/SigninHelperProvider.java",
   "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
-  "java/src/org/chromium/chrome/browser/signin/SigninPromoController.java",
   "java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java",
   "java/src/org/chromium/chrome/browser/signin/SigninUtils.java",
   "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java

@@ -35,11 +35,11 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
 import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration;
 import org.chromium.components.browser_ui.widget.listmenu.ListMenu;

chrome/android/java/res/values/dimens.xml

@@ -165,10 +165,6 @@
     <dimen name="signin_chooser_padding">16dp</dimen>
     <dimen name="signin_screen_top_padding">50dp</dimen>
 
-    <!-- Signin promo dimensions -->
-    <dimen name="signin_promo_account_image_size">48dp</dimen>
-    <dimen name="signin_promo_cold_state_image_size">24dp</dimen>
-
     <!-- Autofill tooltip dimensions -->
     <dimen name="autofill_tooltip_horizontal_padding">16dp</dimen>
     <dimen name="autofill_tooltip_vertical_padding">16dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java

@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
-import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.signin.SyncPromoView;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -29,6 +28,7 @@ import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.AccountManagerFacadeProvider;

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java

@@ -18,13 +18,13 @@ import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
 import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
-import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.ui.favicon.FaviconHelper;

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java

@@ -17,13 +17,13 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
-import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInAllowedObserver;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
 import org.chromium.components.signin.AccountsChangeObserver;

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivity.java

@@ -8,17 +8,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import androidx.annotation.IntDef;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-import org.chromium.components.signin.metrics.SigninAccessPoint;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 /**
  * Allows user to pick an account and sign in. Started from Settings and various sign-in promos.
@@ -27,12 +22,6 @@ import java.lang.annotation.RetentionPolicy;
 public class SigninActivity extends ChromeBaseAppCompatActivity {
     private static final String ARGUMENT_FRAGMENT_ARGS = "SigninActivity.FragmentArgs";
 
-    @IntDef({SigninAccessPoint.SETTINGS, SigninAccessPoint.BOOKMARK_MANAGER,
-            SigninAccessPoint.RECENT_TABS, SigninAccessPoint.SIGNIN_PROMO,
-            SigninAccessPoint.NTP_CONTENT_SUGGESTIONS, SigninAccessPoint.AUTOFILL_DROPDOWN})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface AccessPoint {}
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Make sure the native is initialized before calling super.onCreate(), as it might recreate

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java

@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
 import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.version.ChromeVersionInfo;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
 import org.chromium.components.signin.AccountUtils;

chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java

@@ -19,7 +19,7 @@ import org.chromium.base.IntentUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-import org.chromium.chrome.browser.signin.SigninActivity.AccessPoint;
+import org.chromium.chrome.browser.signin.ui.SigninActivityLauncher.AccessPoint;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.components.signin.metrics.SigninAccessPoint;

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncPromoPreference.java

@@ -18,12 +18,12 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
-import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInAllowedObserver;
 import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.ProfileSyncService.SyncStateChangedListener;
 import org.chromium.components.signin.AccountManagerFacade;

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoDismissTest.java

@@ -33,7 +33,7 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.signin.SigninPromoController;
+import org.chromium.chrome.browser.signin.ui.SigninPromoController;
 import org.chromium.chrome.browser.sync.SyncTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.BookmarkTestRule;

chrome/browser/signin/ui/android/BUILD.gn

@@ -10,6 +10,7 @@ android_library("java") {
     "//base:base_java",
     "//chrome/browser/consent_auditor/android:java",
     "//chrome/browser/flags:java",
+    "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/signin/services/android:java",
     "//components/browser_ui/settings/android:java",
@@ -38,6 +39,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/signin/ui/PersonalizedSigninPromoView.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninActivityLauncher.java",
+    "java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninScrollView.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninView.java",
     "java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerCoordinator.java",
@@ -53,6 +55,11 @@ android_library("java") {
 
 android_resources("java_resources") {
   sources = [
+    "java/res/drawable-hdpi/chrome_sync_logo.png",
+    "java/res/drawable-mdpi/chrome_sync_logo.png",
+    "java/res/drawable-xhdpi/chrome_sync_logo.png",
+    "java/res/drawable-xxhdpi/chrome_sync_logo.png",
+    "java/res/drawable-xxxhdpi/chrome_sync_logo.png",
     "java/res/layout/account_picker_incognito_row.xml",
     "java/res/layout/account_picker_new_account_row.xml",
     "java/res/layout/account_picker_new_account_row_legacy.xml",
@@ -68,6 +75,7 @@ android_resources("java_resources") {
     "java/res/layout/signin_progress_bar_dialog.xml",
     "java/res/layout/signin_view.xml",
     "java/res/layout/signout_wipe_storage_dialog.xml",
+    "java/res/values/dimens.xml",
   ]
   deps = [
     "//chrome/browser/signin/services/android:java_resources",

chrome/browser/signin/ui/android/java/res/values/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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. -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Signin promo dimensions -->
+    <dimen name="signin_promo_account_image_size">48dp</dimen>
+    <dimen name="signin_promo_cold_state_image_size">24dp</dimen>
+</resources>

chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninActivityLauncher.java

@@ -6,10 +6,21 @@ package org.chromium.chrome.browser.signin.ui;
 
 import android.content.Context;
 
+import androidx.annotation.IntDef;
+
 import org.chromium.components.signin.metrics.SigninAccessPoint;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /** Allows for launching {@link SigninActivity} in modularized code. */
 public interface SigninActivityLauncher {
+    @IntDef({SigninAccessPoint.SETTINGS, SigninAccessPoint.BOOKMARK_MANAGER,
+            SigninAccessPoint.RECENT_TABS, SigninAccessPoint.SIGNIN_PROMO,
+            SigninAccessPoint.NTP_CONTENT_SUGGESTIONS, SigninAccessPoint.AUTOFILL_DROPDOWN})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface AccessPoint {}
+
     /**
      * Launches the SigninActivity with default sign-in flow from personalized sign-in promo.
      * @param accessPoint {@link SigninAccessPoint} for starting sign-in flow.

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.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.signin;
+package org.chromium.chrome.browser.signin.ui;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -16,14 +16,11 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.signin.SigninActivity.AccessPoint;
 import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
-import org.chromium.chrome.browser.signin.ui.PersonalizedSigninPromoView;
-import org.chromium.chrome.browser.signin.ui.SigninActivityLauncher;
+import org.chromium.chrome.browser.signin.ui.SigninActivityLauncher.AccessPoint;
 import org.chromium.components.browser_ui.widget.impression.ImpressionTracker;
 import org.chromium.components.browser_ui.widget.impression.OneShotImpressionListener;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
@@ -231,8 +228,8 @@ public class SigninPromoController {
         mProfileData = profileData;
         mWasDisplayed = true;
 
-        assert mImpressionTracker == null : "detach() should be called before setting up a new " +
-                "view";
+        assert mImpressionTracker
+                == null : "detach() should be called before setting up a new view";
         mImpressionTracker = new ImpressionTracker(view);
         mImpressionTracker.setListener(mImpressionFilter);