Commit 5ef8fe82 authored by maxbogue's avatar maxbogue Committed by Commit bot

Move ownership of SigninNotificationController upstream.

Previously owned by GSM downstream. Note that there will be
two SigninNotificationControllers in existence between this
landing and the downstream patch landing, but the only call
its listener makes (cancelNotification) appears to be
idempotent so it shouldn't matter.

BUG=428882

Review URL: https://codereview.chromium.org/952083002

Cr-Commit-Position: refs/heads/master@{#319091}
parent bc422601
...@@ -25,6 +25,7 @@ import org.chromium.base.ObserverList; ...@@ -25,6 +25,7 @@ import org.chromium.base.ObserverList;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.invalidation.InvalidationController; import org.chromium.chrome.browser.invalidation.InvalidationController;
import org.chromium.chrome.browser.notifications.GoogleServicesNotificationController;
import org.chromium.chrome.browser.sync.ProfileSyncService; import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.sync.AndroidSyncSettings; import org.chromium.sync.AndroidSyncSettings;
import org.chromium.sync.internal_api.pub.base.ModelType; import org.chromium.sync.internal_api.pub.base.ModelType;
...@@ -66,6 +67,8 @@ public class SigninManager { ...@@ -66,6 +67,8 @@ public class SigninManager {
private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers = private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
new ObserverList<SignInAllowedObserver>(); new ObserverList<SignInAllowedObserver>();
private final SigninNotificationController mSigninNotificationController;
private Activity mSignInActivity; private Activity mSignInActivity;
private Account mSignInAccount; private Account mSignInAccount;
private SignInFlowObserver mSignInFlowObserver; private SignInFlowObserver mSignInFlowObserver;
...@@ -164,6 +167,13 @@ public class SigninManager { ...@@ -164,6 +167,13 @@ public class SigninManager {
mContext = context.getApplicationContext(); mContext = context.getApplicationContext();
mNativeSigninManagerAndroid = nativeInit(); mNativeSigninManagerAndroid = nativeInit();
mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid); mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
// Setup notification system for Google services. This includes both sign-in and sync.
GoogleServicesNotificationController controller =
GoogleServicesNotificationController.get(mContext);
mSigninNotificationController = new SigninNotificationController(
mContext, controller, AccountManagementFragment.class);
ChromeSigninController.get(mContext).addListener(mSigninNotificationController);
} }
/** /**
...@@ -229,6 +239,13 @@ public class SigninManager { ...@@ -229,6 +239,13 @@ public class SigninManager {
}); });
} }
/**
* Return the SigninNotificationController.
*/
public SigninNotificationController getSigninNotificationController() {
return mSigninNotificationController;
}
/** /**
* Starts the sign-in flow, and executes the callback when ready to proceed. * Starts the sign-in flow, and executes the callback when ready to proceed.
* <p/> * <p/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment