Created the dialog offering the user to merge their account data or keep it

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
index f84cdee70707620788a87e4223c67a72b266a88e..8edc1607df7a9ab9433b15548ce8ca4258178a3b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
@@ -16,10 +16,12 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.firstrun.AccountFirstRunView;
 import org.chromium.chrome.browser.firstrun.ProfileDataCache;
 import org.chromium.chrome.browser.signin.AccountAdder;
+import org.chromium.chrome.browser.signin.AccountSigninView;
 import org.chromium.chrome.browser.signin.SigninManager;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment.Listener;
 import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
 
 /**
@@ -176,7 +178,7 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
         }
 
         if (animate && mPromoType == PROMO_TYPE_SIGN_IN) {
-            ((AccountFirstRunView) mPromo).switchToSignedMode();
+            ((AccountSigninView) mPromo).switchToSignedMode();
         }
 
         final View oldPromo = mPromo;
@@ -249,13 +251,13 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
     }
 
     private View createSignInPromoView() {
-        AccountFirstRunView signInPromoView = (AccountFirstRunView)
-                LayoutInflater.from(getContext()).inflate(R.layout.fre_choose_account, this, false);
+        AccountSigninView signInPromoView = (AccountSigninView) LayoutInflater.from(getContext())
+                .inflate(R.layout.account_signin_view, this, false);
         signInPromoView.init(mModel.getProfileDataCache());
         signInPromoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT;
         ((FrameLayout.LayoutParams) signInPromoView.getLayoutParams()).gravity = Gravity.CENTER;
         signInPromoView.configureForRecentTabsOrBookmarksPage();
-        signInPromoView.setListener(new AccountFirstRunView.Listener() {
+        signInPromoView.setListener(new AccountSigninView.Listener() {
             private String mAccountName;
 
             @Override
@@ -279,7 +281,7 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
             @Override
             public void onDoneClicked() {
                 if (mUserActionListener != null) mUserActionListener.onAccountSelectionConfirmed();
-                SigninManager.get(mActivity).signIn(mAccountName, mActivity, null);
+                SigninManager.get(mActivity).signIn(mAccountName, null, null);
             }
 
             @Override
@@ -292,6 +294,14 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
                 // TODO(bauerb): make sure we shouldn't see SignInPromoView.
                 assert false : "No forced accounts in SignInPromoView";
             }
+
+            @Override
+            public void onPreviousAccountFound(
+                    String oldAccountName, String newAccountName, Listener callback) {
+
+                ConfirmImportSyncDataFragment.showNewInstance(
+                        oldAccountName, newAccountName, mActivity.getFragmentManager(), callback);
+            }
         });
         SigninManager.logSigninStartAccessPoint(mModel.getAccessPoint());
         return signInPromoView;