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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
index b72e67253a8347994ba746c247a9b47ba37ea4ed..654da565f5ef30bf28e66687718d335120890054 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Activity;
+import android.app.FragmentManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -14,7 +15,6 @@ import android.widget.LinearLayout;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.firstrun.AccountFirstRunView;
 import org.chromium.chrome.browser.firstrun.ProfileDataCache;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
@@ -31,9 +31,9 @@ import org.chromium.sync.signin.ChromeSigninController;
 /**
  * This class implements the dialog UI for the signin promo.
  */
-public class SigninPromoScreen
-        extends AlwaysDismissedDialog implements AccountFirstRunView.Listener {
-    private AccountFirstRunView mAccountFirstRunView;
+public class SigninPromoScreen extends AlwaysDismissedDialog
+        implements AccountSigninView.Listener, AccountSigninView.Delegate {
+    private AccountSigninView mAccountFirstRunView;
     private ProfileDataCache mProfileDataCache;
     private String mAccountName;
 
@@ -75,12 +75,13 @@ public class SigninPromoScreen
         setOwnerActivity(activity);
 
         LayoutInflater inflater = LayoutInflater.from(activity);
-        View view = inflater.inflate(R.layout.fre_choose_account, null);
+        View view = inflater.inflate(R.layout.account_signin_view, null);
         mProfileDataCache = new ProfileDataCache(activity, Profile.getLastUsedProfile());
-        mAccountFirstRunView = (AccountFirstRunView) view.findViewById(R.id.fre_account_layout);
+        mAccountFirstRunView = (AccountSigninView) view.findViewById(R.id.account_layout);
         mAccountFirstRunView.init(mProfileDataCache);
         mAccountFirstRunView.configureForAddAccountPromo();
         mAccountFirstRunView.setListener(this);
+        mAccountFirstRunView.setDelegate(this);
 
         setContentView(view, new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -153,4 +154,9 @@ public class SigninPromoScreen
     public void onFailedToSetForcedAccount(String forcedAccountName) {
         assert false : "No forced accounts in SigninPromoScreen";
     }
+
+    @Override
+    public FragmentManager getFragmentManager() {
+        return getOwnerActivity().getFragmentManager();
+    }
 }