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

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

Issue 1367783002: Revert of ChildAccountService[Java] delegates everything to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@child
Patch Set: 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/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 51e45c3857ec2f9fb1ca8cc8f5bdce93cd90a9b8..92640b395efa5e2be3363c0b6cf3ad0cd880d480 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
@@ -23,6 +23,7 @@
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.childaccounts.ChildAccountService;
import org.chromium.chrome.browser.notifications.GoogleServicesNotificationController;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.browser.sync.SyncController;
@@ -503,6 +504,10 @@
if (signInType != SIGNIN_TYPE_INTERACTIVE) {
AccountManagementFragment.setSignOutAllowedPreferenceValue(mContext, false);
+ }
+
+ if (signInType == SIGNIN_TYPE_FORCED_CHILD_ACCOUNT) {
+ ChildAccountService.getInstance(mContext).onChildAccountSigninComplete();
}
SigninManager.get(mContext).logInSignedInUser();

Powered by Google App Engine
This is Rietveld 408576698