| Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
| index 7adf8f3fe38a6ac120234f100a7d9933a91240c6..dc4aef64020d8e51cce40ccffc7b6a199a930954 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
| @@ -199,7 +199,7 @@
|
| mNativeSigninManagerAndroid = nativeInit();
|
| mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
|
|
|
| - AccountTrackerService.get().addSystemAccountsSeededListener(this);
|
| + AccountTrackerService.get(mContext).addSystemAccountsSeededListener(this);
|
| }
|
|
|
| /**
|
| @@ -236,7 +236,8 @@
|
| */
|
| public boolean isSignInAllowed() {
|
| return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
|
| - && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
|
| + && ChromeSigninController.get(mContext).getSignedInUser() == null
|
| + && isSigninSupported();
|
| }
|
|
|
| /**
|
| @@ -366,7 +367,7 @@
|
| */
|
| public void signIn(String accountName, @Nullable final Activity activity,
|
| @Nullable final SignInCallback callback) {
|
| - AccountManagerHelper.get().getAccountFromName(accountName, new Callback<Account>() {
|
| + AccountManagerHelper.get(mContext).getAccountFromName(accountName, new Callback<Account>() {
|
| @Override
|
| public void onResult(Account account) {
|
| signIn(account, activity, callback);
|
| @@ -375,9 +376,9 @@
|
| }
|
|
|
| private void progressSignInFlowSeedSystemAccounts() {
|
| - if (AccountTrackerService.get().checkAndSeedSystemAccounts()) {
|
| + if (AccountTrackerService.get(mContext).checkAndSeedSystemAccounts()) {
|
| progressSignInFlowCheckPolicy();
|
| - } else if (AccountIdProvider.getInstance().canBeUsed()) {
|
| + } else if (AccountIdProvider.getInstance().canBeUsed(mContext)) {
|
| mSignInState.blockedOnAccountSeeding = true;
|
| } else {
|
| Activity activity = mSignInState.activity;
|
| @@ -452,7 +453,7 @@
|
|
|
| // Cache the signed-in account name. This must be done after the native call, otherwise
|
| // sync tries to start without being signed in natively and crashes.
|
| - ChromeSigninController.get().setSignedInAccountName(mSignInState.account.name);
|
| + ChromeSigninController.get(mContext).setSignedInAccountName(mSignInState.account.name);
|
| AndroidSyncSettings.updateAccount(mContext, mSignInState.account);
|
|
|
| if (mSignInState.callback != null) {
|
| @@ -532,7 +533,7 @@
|
| // Native signout must happen before resetting the account so data is deleted correctly.
|
| // http://crbug.com/589028
|
| nativeSignOut(mNativeSigninManagerAndroid);
|
| - ChromeSigninController.get().setSignedInAccountName(null);
|
| + ChromeSigninController.get(mContext).setSignedInAccountName(null);
|
| AndroidSyncSettings.updateAccount(mContext, null);
|
|
|
| if (wipeData) {
|
| @@ -541,7 +542,7 @@
|
| onSignOutDone();
|
| }
|
|
|
| - AccountTrackerService.get().invalidateAccountSeedStatus(true);
|
| + AccountTrackerService.get(mContext).invalidateAccountSeedStatus(true);
|
| }
|
|
|
| /**
|
|
|