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

Unified Diff: components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java

Issue 2850813002: Rename AccountManagerHelper.mAccountManager field to mDelegate (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java
diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java
index 3ec989dc3e076f7a06639bf7b0646f557704beef..761a7286a6f89a379e34daaf3ae9e8980950a86b 100644
--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java
@@ -32,13 +32,9 @@ import java.util.regex.Pattern;
*/
public class AccountManagerHelper {
private static final String TAG = "Sync_Signin";
-
private static final Pattern AT_SYMBOL = Pattern.compile("@");
-
private static final String GMAIL_COM = "gmail.com";
-
private static final String GOOGLEMAIL_COM = "googlemail.com";
-
public static final String GOOGLE_ACCOUNT_TYPE = "com.google";
/**
@@ -50,7 +46,7 @@ public class AccountManagerHelper {
private static final AtomicReference<AccountManagerHelper> sInstance = new AtomicReference<>();
- private final AccountManagerDelegate mAccountManager;
+ private final AccountManagerDelegate mDelegate;
/**
* A simple callback for getAuthToken.
@@ -73,10 +69,10 @@ public class AccountManagerHelper {
}
/**
- * @param accountManager the account manager to use as a backend service
+ * @param delegate the account manager to use as a backend service
*/
- private AccountManagerHelper(AccountManagerDelegate accountManager) {
- mAccountManager = accountManager;
+ private AccountManagerHelper(AccountManagerDelegate delegate) {
+ mDelegate = delegate;
}
/**
@@ -169,7 +165,7 @@ public class AccountManagerHelper {
* See http://crbug.com/517697 for details.
*/
public Account[] getGoogleAccounts() {
- return mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
+ return mDelegate.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
}
/**
@@ -286,7 +282,7 @@ public class AccountManagerHelper {
* @return Whether or not there is an account authenticator for Google accounts.
*/
public boolean hasGoogleAccountAuthenticator() {
- AuthenticatorDescription[] descs = mAccountManager.getAuthenticatorTypes();
+ AuthenticatorDescription[] descs = mDelegate.getAuthenticatorTypes();
for (AuthenticatorDescription desc : descs) {
if (GOOGLE_ACCOUNT_TYPE.equals(desc.type)) return true;
}
@@ -305,7 +301,7 @@ public class AccountManagerHelper {
ConnectionRetry.runAuthTask(new AuthTask<String>() {
@Override
public String run() throws AuthException {
- return mAccountManager.getAuthToken(account, authTokenType);
+ return mDelegate.getAuthToken(account, authTokenType);
}
@Override
public void onSuccess(String token) {
@@ -339,7 +335,7 @@ public class AccountManagerHelper {
ConnectionRetry.runAuthTask(new AuthTask<Boolean>() {
@Override
public Boolean run() throws AuthException {
- mAccountManager.invalidateAuthToken(authToken);
+ mDelegate.invalidateAuthToken(authToken);
return true;
}
@Override
@@ -356,7 +352,7 @@ public class AccountManagerHelper {
}
private boolean hasFeatures(Account account, String[] features) {
- return mAccountManager.hasFeatures(account, features);
+ return mDelegate.hasFeatures(account, features);
}
private void hasFeatures(
@@ -380,7 +376,7 @@ public class AccountManagerHelper {
*/
public void updateCredentials(
Account account, Activity activity, @Nullable Callback<Boolean> callback) {
- mAccountManager.updateCredentials(account, activity, callback);
+ mDelegate.updateCredentials(account, activity, callback);
}
private interface AuthTask<T> {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698