Commit e2c8ca23 authored by Alice Wang's avatar Alice Wang Committed by Commit Bot

[Signin][Android] Remove ChromeSigninController from PaymentRequestUI

This CL replaces ChromeSigninController in
payments/ui/PaymentRequestUI.java by IdentityManager.

Bug: 1049630
Change-Id: Ia29bc0a51388bf33372effa5bff4c43b375150b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083184Reviewed-by: default avatarTanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746742}
parent 2a236d52
...@@ -46,10 +46,11 @@ import org.chromium.chrome.browser.payments.ShippingStrings; ...@@ -46,10 +46,11 @@ import org.chromium.chrome.browser.payments.ShippingStrings;
import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.LineItemBreakdownSection; import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.LineItemBreakdownSection;
import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection; import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection;
import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.SectionSeparator; import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.SectionSeparator;
import org.chromium.chrome.browser.signin.IdentityServicesProvider;
import org.chromium.components.browser_ui.widget.FadingEdgeScrollView; import org.chromium.components.browser_ui.widget.FadingEdgeScrollView;
import org.chromium.components.browser_ui.widget.animation.FocusAnimator; import org.chromium.components.browser_ui.widget.animation.FocusAnimator;
import org.chromium.components.browser_ui.widget.animation.Interpolators; import org.chromium.components.browser_ui.widget.animation.Interpolators;
import org.chromium.components.signin.ChromeSigninController; import org.chromium.components.signin.base.CoreAccountInfo;
import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.NoUnderlineClickableSpan;
import org.chromium.ui.text.SpanApplier; import org.chromium.ui.text.SpanApplier;
import org.chromium.ui.text.SpanApplier.SpanInfo; import org.chromium.ui.text.SpanApplier.SpanInfo;
...@@ -1106,11 +1107,16 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O ...@@ -1106,11 +1107,16 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
String message; String message;
if (!mShowDataSource) { if (!mShowDataSource) {
message = mContext.getString(R.string.payments_card_and_address_settings); message = mContext.getString(R.string.payments_card_and_address_settings);
} else if (ChromeSigninController.get().isSignedIn()) {
message = mContext.getString(R.string.payments_card_and_address_settings_signed_in,
ChromeSigninController.get().getSignedInAccountName());
} else { } else {
message = mContext.getString(R.string.payments_card_and_address_settings_signed_out); CoreAccountInfo coreAccountInfo =
IdentityServicesProvider.get().getIdentityManager().getPrimaryAccountInfo();
if (coreAccountInfo != null) {
message = mContext.getString(R.string.payments_card_and_address_settings_signed_in,
coreAccountInfo.getEmail());
} else {
message =
mContext.getString(R.string.payments_card_and_address_settings_signed_out);
}
} }
NoUnderlineClickableSpan settingsSpan = new NoUnderlineClickableSpan( NoUnderlineClickableSpan settingsSpan = new NoUnderlineClickableSpan(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment