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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java

Issue 1000823002: Move lonely FirstRunUtil method to SignInManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't remove FirstRunUtil just yet Created 5 years, 9 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 | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtil.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
index 96a4915a5de38c466542631ed266446e7a456aa4..810dfe78253fb26e943be6bc20c5bd88130d9bf9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
@@ -81,10 +81,10 @@ public class FirstRunSignInProcessor {
mHasChildAccount = hasChildAccount();
mSignInManager.onFirstRunCheckDone();
mSignInType = mHasChildAccount
- ? FirstRunUtil.SIGNIN_TYPE_FORCED_CHILD_ACCOUNT
+ ? SigninManager.SIGNIN_TYPE_FORCED_CHILD_ACCOUNT
: (mIsAndroidEduDevice
- ? FirstRunUtil.SIGNIN_TYPE_FORCED_EDU
- : FirstRunUtil.SIGNIN_TYPE_INTERACTIVE);
+ ? SigninManager.SIGNIN_TYPE_FORCED_EDU
+ : SigninManager.SIGNIN_TYPE_INTERACTIVE);
// We allow to pass-through without FRE being complete only if
// - FRE is disabled, or
@@ -129,12 +129,13 @@ public class FirstRunSignInProcessor {
final Account[] googleAccounts =
AccountManagerHelper.get(mActivity).getGoogleAccounts();
+ SigninManager signinManager = SigninManager.get(mActivity.getApplicationContext());
if (!FeatureUtilities.canAllowSync(mActivity)
- || !SigninManager.get(mActivity.getApplicationContext()).isSignInAllowed()
+ || !signinManager.isSignInAllowed()
|| googleAccounts.length != 1) return;
- FirstRunUtil.signInToSelectedAccount(mActivity, googleAccounts[0],
- mSignInType, FirstRunUtil.SIGNIN_SYNC_IMMEDIATELY, mShowSignInNotification,
+ signinManager.signInToSelectedAccount(mActivity, googleAccounts[0],
+ mSignInType, SigninManager.SIGNIN_SYNC_IMMEDIATELY, mShowSignInNotification,
mObserver);
}
@@ -146,8 +147,9 @@ public class FirstRunSignInProcessor {
assert !getFirstRunFlowSignInComplete(mActivity);
final String accountName = getFirstRunFlowSignInAccountName(mActivity);
+ SigninManager signinManager = SigninManager.get(mActivity.getApplicationContext());
if (!FeatureUtilities.canAllowSync(mActivity)
- || !SigninManager.get(mActivity.getApplicationContext()).isSignInAllowed()
+ || !signinManager.isSignInAllowed()
|| TextUtils.isEmpty(accountName)) {
setFirstRunFlowSignInComplete(mActivity, true);
if (mObserver != null) mObserver.onSigninComplete();
@@ -162,8 +164,8 @@ public class FirstRunSignInProcessor {
return;
}
- FirstRunUtil.signInToSelectedAccount(mActivity, account,
- mSignInType, FirstRunUtil.SIGNIN_SYNC_IMMEDIATELY, mShowSignInNotification,
+ signinManager.signInToSelectedAccount(mActivity, account,
+ mSignInType, SigninManager.SIGNIN_SYNC_IMMEDIATELY, mShowSignInNotification,
new SignInFlowObserver() {
private void completeSignIn() {
// Show sync settings if user pressed the "Settings" button.
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtil.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698