Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3454)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

Issue 2784353002: Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Fix tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 dc4aef64020d8e51cce40ccffc7b6a199a930954..7adf8f3fe38a6ac120234f100a7d9933a91240c6 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 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
mNativeSigninManagerAndroid = nativeInit();
mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
- AccountTrackerService.get(mContext).addSystemAccountsSeededListener(this);
+ AccountTrackerService.get().addSystemAccountsSeededListener(this);
}
/**
@@ -236,8 +236,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
*/
public boolean isSignInAllowed() {
return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
- && ChromeSigninController.get(mContext).getSignedInUser() == null
- && isSigninSupported();
+ && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
}
/**
@@ -367,7 +366,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
*/
public void signIn(String accountName, @Nullable final Activity activity,
@Nullable final SignInCallback callback) {
- AccountManagerHelper.get(mContext).getAccountFromName(accountName, new Callback<Account>() {
+ AccountManagerHelper.get().getAccountFromName(accountName, new Callback<Account>() {
@Override
public void onResult(Account account) {
signIn(account, activity, callback);
@@ -376,9 +375,9 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
}
private void progressSignInFlowSeedSystemAccounts() {
- if (AccountTrackerService.get(mContext).checkAndSeedSystemAccounts()) {
+ if (AccountTrackerService.get().checkAndSeedSystemAccounts()) {
progressSignInFlowCheckPolicy();
- } else if (AccountIdProvider.getInstance().canBeUsed(mContext)) {
+ } else if (AccountIdProvider.getInstance().canBeUsed()) {
mSignInState.blockedOnAccountSeeding = true;
} else {
Activity activity = mSignInState.activity;
@@ -453,7 +452,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
// 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(mContext).setSignedInAccountName(mSignInState.account.name);
+ ChromeSigninController.get().setSignedInAccountName(mSignInState.account.name);
AndroidSyncSettings.updateAccount(mContext, mSignInState.account);
if (mSignInState.callback != null) {
@@ -533,7 +532,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
// Native signout must happen before resetting the account so data is deleted correctly.
// http://crbug.com/589028
nativeSignOut(mNativeSigninManagerAndroid);
- ChromeSigninController.get(mContext).setSignedInAccountName(null);
+ ChromeSigninController.get().setSignedInAccountName(null);
AndroidSyncSettings.updateAccount(mContext, null);
if (wipeData) {
@@ -542,7 +541,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
onSignOutDone();
}
- AccountTrackerService.get(mContext).invalidateAccountSeedStatus(true);
+ AccountTrackerService.get().invalidateAccountSeedStatus(true);
}
/**

Powered by Google App Engine
This is Rietveld 408576698