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

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

Issue 2014833002: Show dialogs for syncing to managed accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace getContext with getActivity in AccountManagementFragment. Created 4 years, 6 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/AccountManagementFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
index 915deb2f536eb8592e5c089bbb7f886075894fc7..80b8c1c6d5d6ed7c4457f16bda157a00a3fa1563 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
@@ -70,7 +70,8 @@ import java.util.HashMap;
*/
public class AccountManagementFragment extends PreferenceFragment
implements SignOutDialogListener, ProfileDownloader.Observer,
- SyncStateChangedListener, SignInStateObserver {
+ SyncStateChangedListener, SignInStateObserver,
+ ConfirmManagedSyncDataDialog.Listener {
public static final String SIGN_OUT_DIALOG_TAG = "sign_out_dialog_tag";
private static final String CLEAR_DATA_PROGRESS_DIALOG_TAG = "clear_data_progress";
@@ -250,13 +251,24 @@ public class AccountManagementFragment extends PreferenceFragment
ProfileAccountManagementMetrics.TOGGLE_SIGNOUT,
mGaiaServiceType);
- SignOutDialogFragment signOutFragment = new SignOutDialogFragment();
- Bundle args = new Bundle();
- args.putInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
- signOutFragment.setArguments(args);
+ String managementDomain =
+ SigninManager.get(getActivity()).getManagementDomain();
+ if (managementDomain != null) {
+ // Show the 'You are signing out of a managed account' dialog.
+ ConfirmManagedSyncDataDialog.showSignOutFromManagedAccountDialog(
+ AccountManagementFragment.this, getFragmentManager(),
+ getResources(), managementDomain);
+ } else {
+ // Show the 'You are signing out' dialog.
+ SignOutDialogFragment signOutFragment = new SignOutDialogFragment();
+ Bundle args = new Bundle();
+ args.putInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
+ signOutFragment.setArguments(args);
+
+ signOutFragment.setTargetFragment(AccountManagementFragment.this, 0);
+ signOutFragment.show(getFragmentManager(), SIGN_OUT_DIALOG_TAG);
+ }
- signOutFragment.setTargetFragment(AccountManagementFragment.this, 0);
- signOutFragment.show(getFragmentManager(), SIGN_OUT_DIALOG_TAG);
return true;
}
@@ -502,6 +514,17 @@ public class AccountManagementFragment extends PreferenceFragment
}
}
+ // ConfirmManagedSyncDataDialog.Listener implementation
+ @Override
+ public void onConfirm() {
+ onSignOutClicked();
+ }
+
+ @Override
+ public void onCancel() {
+ onSignOutDialogDismissed(false);
+ }
+
// ProfileSyncServiceListener implementation:
@Override

Powered by Google App Engine
This is Rietveld 408576698