[BoC Signin] Add toast for when signin is attempted while prohibited.

Approved Merge Issue: https://bugs.chromium.org/p/chromium/issues/detail?id=1427314

(cherry picked from commit dd8fea9)

Bug: 1427314, b/273822882
Change-Id: I663e3eed40008ab2e94048f0484d842297952c1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4354853
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Nick Birnie <birnie@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1121503}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376155
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5672@{#74}
Cr-Branched-From: 5f2a724-refs/heads/main@{#1121455}

Author: Nick Birnie

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java

@@ -24,13 +24,15 @@
 import org.chromium.components.signin.base.GoogleServiceAuthError;
 import org.chromium.components.signin.identitymanager.AccountInfoServiceProvider;
 import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.widget.Toast;
 
 /** Coordinator for displaying the signin flow in the bottom sheet. */
 public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
     private final Profile mProfile;
     private final WindowAndroid mWindowAndroid;
     private final BottomSheetController mController;
     private final SigninManager mSigninManager;
+    private boolean mSetTestToast;
     private AccountPickerBottomSheetCoordinator mAccountPickerBottomSheetCoordinator;
 
     public SigninBottomSheetCoordinator(
@@ -39,6 +41,7 @@ public SigninBottomSheetCoordinator(
         mController = controller;
         mProfile = profile;
         mSigninManager = IdentityServicesProvider.get().getSigninManager(mProfile);
+        mSetTestToast = false;
     }
 
     @Override
@@ -49,26 +52,33 @@ public void signIn(
             String accountEmail, Callback<GoogleServiceAuthError> onSignInErrorCallback) {
         Account account = AccountUtils.createAccountFromName(accountEmail);
         AccountInfoServiceProvider.get().getAccountInfoByEmail(accountEmail).then(accountInfo -> {
-            mSigninManager.signin(account, new SigninManager.SignInCallback() {
-                @Override
-                public void onSignInComplete() {
-                    RecordHistogram.recordBooleanHistogram(
-                            "ContentSuggestions.Feed.SignInFromFeedAction.SignInSuccessful", true);
-                    mController.hideContent(mController.getCurrentSheetContent(), true);
-                }
-
-                @Override
-                public void onSignInAborted() {
-                    RecordHistogram.recordBooleanHistogram(
-                            "ContentSuggestions.Feed.SignInFromFeedAction.SignInSuccessful", false);
-                    // onSignInErrorCallback is called by the WebSigninBridge which is not
-                    // implemented in this signin flow as we do not need to wait for cookies to
-                    // propagate before proceeding with the Feed refresh. Instead of calling
-                    // AccountPickerBottomSheetMediator.onSigninFailed() from the signin bridge we
-                    // directly perform the creation of the "try again" bottom sheet view:
-                    mAccountPickerBottomSheetCoordinator.setTryAgainBottomSheetView();
-                }
-            });
+            if (mSigninManager.isSigninAllowed()) {
+                mSigninManager.signin(account, new SigninManager.SignInCallback() {
+                    @Override
+                    public void onSignInComplete() {
+                        RecordHistogram.recordBooleanHistogram(
+                                "ContentSuggestions.Feed.SignInFromFeedAction.SignInSuccessful",
+                                true);
+                        mController.hideContent(mController.getCurrentSheetContent(), true);
+                    }
+
+                    @Override
+                    public void onSignInAborted() {
+                        RecordHistogram.recordBooleanHistogram(
+                                "ContentSuggestions.Feed.SignInFromFeedAction.SignInSuccessful",
+                                false);
+                        // onSignInErrorCallback is called by the WebSigninBridge which is not
+                        // implemented in this signin flow as we do not need to wait for cookies to
+                        // propagate before proceeding with the Feed refresh. Instead of calling
+                        // AccountPickerBottomSheetMediator.onSigninFailed() from the signin bridge
+                        // we directly perform the creation of the "try again" bottom sheet view:
+                        mAccountPickerBottomSheetCoordinator.setTryAgainBottomSheetView();
+                    }
+                });
+            } else {
+                makeSigninNotAllowedToast();
+                mController.hideContent(mController.getCurrentSheetContent(), true);
+            }
         });
     }
 
@@ -82,6 +92,13 @@ public void show() {
                 mWindowAndroid, mController, this, new BottomSheetStrings());
     }
 
+    private void makeSigninNotAllowedToast() {
+        if (mSetTestToast) return;
+        Toast.makeText(mWindowAndroid.getActivity().get(),
+                     R.string.sign_in_to_chrome_disabled_by_user_summary, Toast.LENGTH_SHORT)
+                .show();
+    }
+
     @VisibleForTesting
     public View getBottomSheetViewForTesting() {
         return mAccountPickerBottomSheetCoordinator.getBottomSheetViewForTesting();
@@ -93,6 +110,11 @@ public void setAccountPickerBottomSheetCoordinator(
         this.mAccountPickerBottomSheetCoordinator = accountPickerBottomSheetCoordinator;
     }
 
+    @VisibleForTesting
+    public void setToastOverrideForTesting() {
+        this.mSetTestToast = true;
+    }
+
     /** Stores bottom sheet strings for signin from back of card entry point */
     public static class BottomSheetStrings implements AccountPickerBottomSheetStrings {
         /** Returns the title string for the bottom sheet dialog. */

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinatorTest.java

@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -28,6 +29,7 @@
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator;
 import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
+import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.signin.AccountUtils;
 import org.chromium.components.signin.base.CoreAccountInfo;
@@ -48,6 +50,9 @@ public class SigninBottomSheetCoordinatorTest {
     @Mock
     private BottomSheetController mBottomSheetControllerMock;
 
+    @Mock
+    private BottomSheetContent mBottomSheetContentMock;
+
     @Mock
     private WindowAndroid mWindowAndroidMock;
 
@@ -71,6 +76,7 @@ public void setUp() {
         IdentityServicesProvider.setInstanceForTests(mock(IdentityServicesProvider.class));
         when(IdentityServicesProvider.get().getSigninManager(mProfileMock))
                 .thenReturn(mSigninManagerMock);
+        when(mSigninManagerMock.isSigninAllowed()).thenReturn(true);
         mCoreAccountInfo = mAccountManagerTestRule.addAccount(TEST_EMAIL);
         mSigninCoordinator = new SigninBottomSheetCoordinator(
                 mWindowAndroidMock, mBottomSheetControllerMock, mProfileMock);
@@ -109,4 +115,13 @@ public void testSignInAborted() {
         mSigninCoordinator.signIn(TEST_EMAIL, error -> {});
         histogramWatcher.assertExpected();
     }
+
+    @Test
+    public void testSignInNotAllowed() {
+        when(mSigninManagerMock.isSigninAllowed()).thenReturn(false);
+        mSigninCoordinator.setToastOverrideForTesting();
+        mSigninCoordinator.signIn(TEST_EMAIL, error -> {});
+        verify(mSigninManagerMock, never())
+                .signin(eq(AccountUtils.createAccountFromName(TEST_EMAIL)), any());
+    }
 }

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -290,6 +290,9 @@ CHAR_LIMIT guidelines:
       <message name="IDS_SIGN_IN_TO_CHROME_DISABLED_SUMMARY" desc="A descriptive line of text that appears under the 'Sign in to Chrome' option, in Chrome Settings on Android. The text explains why 'Sign in to Chrome' is disabled. 'Administrator' refers to the IT administrator of the company/organization that owns the user’s device.">
         Disabled by the administrator of this device
       </message>
+      <message name="IDS_SIGN_IN_TO_CHROME_DISABLED_BY_USER_SUMMARY" desc="A descriptive line of text that appears when a user tries to signin when signin is disabled by the Google Services option in settings. The text explains why 'Sign in to Chrome' is not available.">
+        Not available on your device
+      </message>
       <message name="IDS_SIGN_IN_GOOGLE_ACTIVITY_CONTROLS_TITLE" desc="Title of Google activity controls preference in signed in accounts settings screen">
         Google activity controls
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SIGN_IN_TO_CHROME_DISABLED_BY_USER_SUMMARY.png.sha1

@@ -0,0 +1 @@
+ff000a9dc3e0cecfb71597667d90ac50a2b1b3e5