| Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
|
| index 70f146581c4d33ebb3b9fe1d44fabb6c34a830b4..6bcd00a9b39618e643a879c43eafdf2154ae896e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
|
| @@ -20,7 +20,7 @@ public class AutoLoginDelegate {
|
| private final AutoLoginProcessor mAutoLoginProcessor;
|
|
|
| // nativeInfoBar -> AutoLoginAccountDelegate
|
| - private Pair<Integer, AutoLoginAccountDelegate> mAccountHelper;
|
| + private Pair<Long, AutoLoginAccountDelegate> mAccountHelper;
|
|
|
| public AutoLoginDelegate(AutoLoginProcessor autoLoginProcessor, Activity activity) {
|
| mActivity = activity;
|
| @@ -32,7 +32,7 @@ public class AutoLoginDelegate {
|
| * @return the account name of the device if any.
|
| */
|
| @CalledByNative
|
| - String initializeAccount(int nativeInfoBar, String realm, String account, String args) {
|
| + String initializeAccount(long nativeInfoBar, String realm, String account, String args) {
|
| AutoLoginAccountDelegate accountHelper =
|
| new AutoLoginAccountDelegate(mActivity, mAutoLoginProcessor, realm, account, args);
|
|
|
| @@ -40,7 +40,7 @@ public class AutoLoginDelegate {
|
| return "";
|
| }
|
|
|
| - mAccountHelper = new Pair<Integer, AutoLoginAccountDelegate>(nativeInfoBar, accountHelper);
|
| + mAccountHelper = new Pair<Long, AutoLoginAccountDelegate>(nativeInfoBar, accountHelper);
|
| return accountHelper.getAccountName();
|
| }
|
|
|
| @@ -48,7 +48,7 @@ public class AutoLoginDelegate {
|
| * Log in a user to a given google service.
|
| */
|
| @CalledByNative
|
| - boolean logIn(int nativeInfoBar) {
|
| + boolean logIn(long nativeInfoBar) {
|
| AutoLoginAccountDelegate account =
|
| mAccountHelper != null && mAccountHelper.first == nativeInfoBar ?
|
| mAccountHelper.second : null;
|
| @@ -64,7 +64,7 @@ public class AutoLoginDelegate {
|
| * Clear account information for cancelled login requests.
|
| */
|
| @CalledByNative
|
| - boolean cancelLogIn(int nativeInfoBar) {
|
| + boolean cancelLogIn(long nativeInfoBar) {
|
| mAccountHelper = null;
|
| return true;
|
| }
|
| @@ -76,7 +76,7 @@ public class AutoLoginDelegate {
|
| String result) {
|
|
|
| if (mAccountHelper != null) {
|
| - int infoBar = mAccountHelper.first;
|
| + long infoBar = mAccountHelper.first;
|
| AutoLoginAccountDelegate delegate = mAccountHelper.second;
|
| if (!delegate.loginRequested()) {
|
| nativeLoginDismiss(infoBar);
|
| @@ -95,8 +95,8 @@ public class AutoLoginDelegate {
|
| }
|
| }
|
|
|
| - private native void nativeLoginSuccess(int nativeAutoLoginInfoBarDelegateAndroid,
|
| + private native void nativeLoginSuccess(long nativeAutoLoginInfoBarDelegateAndroid,
|
| String result);
|
| - private native void nativeLoginFailed(int nativeAutoLoginInfoBarDelegateAndroid);
|
| - private native void nativeLoginDismiss(int nativeAutoLoginInfoBarDelegateAndroid);
|
| + private native void nativeLoginFailed(long nativeAutoLoginInfoBarDelegateAndroid);
|
| + private native void nativeLoginDismiss(long nativeAutoLoginInfoBarDelegateAndroid);
|
| }
|
|
|