Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java |
index 37872586252f73e2301abbaaa3543db3d1b84e06..a735c761618314dfb929ed50a496b1589aa27f95 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java |
@@ -4,10 +4,10 @@ |
package org.chromium.chrome.browser.signin; |
+import android.content.Context; |
import android.content.Intent; |
import android.provider.Settings; |
-import org.chromium.base.ContextUtils; |
import org.chromium.base.ThreadUtils; |
import org.chromium.base.annotations.CalledByNative; |
import org.chromium.chrome.browser.profiles.Profile; |
@@ -38,21 +38,25 @@ |
private static final String EXTRA_VALUE_GOOGLE_ACCOUNTS = "com.google"; |
@CalledByNative |
- private static void openAccountManagementScreen(Profile profile, int gaiaServiceType) { |
+ private static void openAccountManagementScreen( |
+ Context applicationContext, Profile profile, int gaiaServiceType) { |
ThreadUtils.assertOnUiThread(); |
if (gaiaServiceType == GAIA_SERVICE_TYPE_SIGNUP) { |
- openAndroidAccountCreationScreen(); |
+ openAndroidAccountCreationScreen(applicationContext); |
return; |
} |
- AccountManagementFragment.openAccountManagementScreen(gaiaServiceType); |
+ AccountManagementFragment.openAccountManagementScreen( |
+ applicationContext, profile, gaiaServiceType); |
} |
/** |
* Opens the Android account manager for adding or creating a Google account. |
+ * @param applicationContext |
*/ |
- private static void openAndroidAccountCreationScreen() { |
+ private static void openAndroidAccountCreationScreen( |
+ Context applicationContext) { |
logEvent(ProfileAccountManagementMetrics.DIRECT_ADD_ACCOUNT, GAIA_SERVICE_TYPE_SIGNUP); |
Intent createAccountIntent = new Intent(Settings.ACTION_ADD_ACCOUNT); |
@@ -62,7 +66,7 @@ |
| Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK |
| Intent.FLAG_ACTIVITY_CLEAR_TOP); |
- ContextUtils.getApplicationContext().startActivity(createAccountIntent); |
+ applicationContext.startActivity(createAccountIntent); |
} |
/** |