[Signin] Update order of buttons in dialog for merging data

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java
index 2814787a08629c79d5c82828fc332f7cf6dc4f9a..2639064275db5bad27daa8e05f5c2ec7b31ef392 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java
@@ -13,6 +13,7 @@ import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.chromium.base.VisibleForTesting;
@@ -159,8 +160,18 @@ public class ConfirmImportSyncDataDialog extends DialogFragment
             }
         }
 
+        // In the switching case, re-order the buttons so the checked one is at

[gogerald1, 2017/01/05 15:39:38]

nit: ...default checked one...

[bzanotti, 2017/01/05 17:39:31]

Done.

+        // the top.
+        if (importSyncType == ImportSyncType.SWITCHING_SYNC_ACCOUNTS) {
+            LinearLayout layout =
+                    (LinearLayout) v.findViewById(R.id.sync_import_data_linear_layout);
+            layout.removeAllViews();
+            layout.addView(prompt);
+            layout.addView(mKeepSeparateOption);
+            layout.addView(mConfirmImportOption);

[gogerald1, 2017/01/05 15:39:38]

Could you just remove the mConfirmImportOption, then add it back (will be added
to the end by default).

nit: move this logic in to line 157?
nit: you can call getParent to find the parent view.

[bzanotti, 2017/01/05 17:39:31]

Done.

I can't move it to line 157 as it would only be executed for non-managed
accounts.

I find it more readable to access the parent view via its id. I'll keep it this
way if it's fine with you.

+        }
+
         return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
-                .setTitle(R.string.sync_import_data_title)
                 .setPositiveButton(R.string.continue_button, this)
                 .setNegativeButton(R.string.cancel, this)
                 .setView(v)