Unify and Improve the Sign-In and Sync Confirmation Screens on Clank.

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 96ac59b2b460988b04aa90805158aa5292a4ac82..b72e67253a8347994ba746c247a9b47ba37ea4ed 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
@@ -35,6 +35,7 @@ public class SigninPromoScreen
         extends AlwaysDismissedDialog implements AccountFirstRunView.Listener {
     private AccountFirstRunView mAccountFirstRunView;
     private ProfileDataCache mProfileDataCache;
+    private String mAccountName;
 
     /**
      * Launches the signin promo if it needs to be displayed.
@@ -98,15 +99,30 @@ public class SigninPromoScreen
         mProfileDataCache.destroy();
         mProfileDataCache = null;
     }
+    @Override
+    public void onAccountSelectionCanceled() {
+        SigninPromoUma.recordAction(SigninPromoUma.SIGNIN_PROMO_DECLINED);
+        dismiss();
+    }
+
+    @Override
+    public void onNewAccount() {
+        AccountAdder.getInstance().addAccount(getOwnerActivity(), AccountAdder.ADD_ACCOUNT_RESULT);
+    }
 
     @Override
-    public void onAccountSelectionConfirmed(String accountName) {
+    public void onAccountSelected(String accountName) {
+        mAccountName = accountName;
+    }
+
+    @Override
+    public void onDoneClicked() {
         Activity activity = getOwnerActivity();
         RecordUserAction.record("Signin_Signin_FromSigninPromo");
-        SigninManager.get(activity).signIn(accountName, activity, new SignInCallback() {
+        SigninManager.get(activity).signIn(mAccountName, activity, new SignInCallback() {
             @Override
             public void onSignInComplete() {
-                mAccountFirstRunView.switchToSignedMode();
+                SigninManager.get(getOwnerActivity()).logInSignedInUser();
                 SigninPromoUma.recordAction(SigninPromoUma.SIGNIN_PROMO_ACCEPTED);
             }
 
@@ -119,28 +135,12 @@ public class SigninPromoScreen
     }
 
     @Override
-    public void onAccountSelectionCanceled() {
-        SigninPromoUma.recordAction(SigninPromoUma.SIGNIN_PROMO_DECLINED);
-        dismiss();
-    }
-
-    @Override
-    public void onNewAccount() {
-        AccountAdder.getInstance().addAccount(getOwnerActivity(), AccountAdder.ADD_ACCOUNT_RESULT);
-    }
-
-    @Override
-    public void onSigningInCompleted(String accountName) {
-        dismiss();
-    }
-
-    @Override
-    public void onSettingsButtonClicked(String accountName) {
+    public void onSettingsClicked() {
         if (ProfileSyncService.get() != null) {
             Intent intent = PreferencesLauncher.createIntentForSettingsPage(getContext(),
                     SyncCustomizationFragment.class.getName());
             Bundle args = new Bundle();
-            args.putString(SyncCustomizationFragment.ARGUMENT_ACCOUNT, accountName);
+            args.putString(SyncCustomizationFragment.ARGUMENT_ACCOUNT, mAccountName);
             intent.putExtra(Preferences.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
             getContext().startActivity(intent);
         }