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

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

Issue 1357643002: [Android]Don't check for child account/EDU device for every activity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert SignInPreference to avoid 2 sided patch Created 5 years, 3 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/firstrun/FirstRunFlowSequencer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
index 699e721ba2e6aa8bfd8c03670e9635593ec3c826..674258f7cd16674776febb9dc40788135e702604 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
@@ -74,7 +74,7 @@ public abstract class FirstRunFlowSequencer {
mHasChildAccount = hasChildAccount();
processFreEnvironment();
}
- }.start(mActivity);
+ }.start(mActivity.getApplicationContext());
}
/**
@@ -173,6 +173,10 @@ public abstract class FirstRunFlowSequencer {
freProperties.putBoolean(AccountFirstRunFragment.IS_CHILD_ACCOUNT, mHasChildAccount);
onFlowIsKnown(mActivity, freProperties);
+ if (mHasChildAccount || forceEduSignIn) {
+ // Child and Edu forced signins are processed independently.
+ FirstRunSigninProcessor.setFirstRunFlowSignInComplete(context, true);
+ }
}
/**
@@ -188,7 +192,7 @@ public abstract class FirstRunFlowSequencer {
}
// Mark the FRE flow as complete and set the sign-in flow preferences if necessary.
- FirstRunSignInProcessor.finalizeFirstRunFlowState(activity, data);
+ FirstRunSigninProcessor.finalizeFirstRunFlowState(activity, data);
}
/**

Powered by Google App Engine
This is Rietveld 408576698