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

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 946b28ac1b4b89ee4364c6b8d45dddc84b964593..99039a30fb434c0dd71db102fe4f5b7fa312c777 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
@@ -245,14 +245,8 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
         signInPromoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT;
         ((FrameLayout.LayoutParams) signInPromoView.getLayoutParams()).gravity = Gravity.CENTER;
         signInPromoView.configureForRecentTabsPage();
-        signInPromoView.setCanCancel(false);
         signInPromoView.setListener(new AccountFirstRunView.Listener() {
-            @Override
-            public void onAccountSelectionConfirmed(String accountName) {
-                if (mUserActionListener != null) mUserActionListener.onAccountSelectionConfirmed();
-
-                ConfirmAccountChangeFragment.confirmSyncAccount(accountName, mActivity);
-            }
+            private String mAccountName;
 
             @Override
             public void onAccountSelectionCanceled() {
@@ -267,12 +261,19 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti
             }
 
             @Override
-            public void onSigningInCompleted(String accountName) {
-                assert false : "Button should be hidden";
+            public void onSignIn(String accountName) {
+                mAccountName = accountName;
+            }
+
+            @Override
+            public void onDoneClicked() {
+                if (mUserActionListener != null) mUserActionListener.onAccountSelectionConfirmed();
+
+                ConfirmAccountChangeFragment.confirmSyncAccount(mAccountName, mActivity);
             }
 
             @Override
-            public void onSettingsButtonClicked(String accountName) {
+            public void onSettingsClicked() {
                 assert false : "Button should be hidden";
             }