Unified Bookmarks and Recent Tabs signin methods.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
index a301e5523d9ca5ec3cdd7ae9f8f0d20230e69429..328bb4ac2c5e8b27b9fefbd5bdea74c8b68e3a88 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
@@ -27,8 +27,9 @@ import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
 import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
 import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
 import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow;
-import org.chromium.chrome.browser.ntp.RecentTabsPromoView.UserActionListener;
 import org.chromium.chrome.browser.ntp.RecentlyClosedBridge.RecentlyClosedTab;
+import org.chromium.chrome.browser.signin.SigninAccessPoint;
+import org.chromium.chrome.browser.signin.SigninAndSyncView;
 import org.chromium.ui.WindowOpenDisposition;
 import org.chromium.ui.base.DeviceFormFactor;
 
@@ -593,20 +594,16 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
         View getChildView(int childPosition, boolean isLastChild, View convertView,
                 ViewGroup parent) {
             if (convertView == null) {
-                convertView = new RecentTabsPromoView(
-                        mActivity, mRecentTabsManager, new UserActionListener() {
-                            @Override
-                            public void onAccountSelectionConfirmed() {
-                                RecordUserAction.record("Signin_Signin_FromRecentTabs");
-                            }
-                            @Override
-                            public void onNewAccount() {}
-                            @Override
-                            public void onAccountSelectionCancelled() {
-                                mRecentTabsManager.setSigninPromoDeclined();
-                                notifyDataSetChanged();
-                            }
-                        });
+                SigninAndSyncView.Listener listener = new SigninAndSyncView.Listener(){

[Bernhard Bauer, 2016/04/20 10:59:06]

Nit: Space before opening brace.

[PEConn, 2016/04/25 11:21:23]

Done.

+                    @Override
+                    public void onViewDismissed() {
+                        mRecentTabsManager.setSigninPromoDeclined();
+                        notifyDataSetChanged();
+                    }
+                };
+
+                convertView =
+                        new SigninAndSyncView(mActivity, listener, SigninAccessPoint.RECENT_TABS);
             }
             if (!mRecentTabsManager.isSignedIn()) {
                 RecordUserAction.record("Signin_Impression_FromRecentTabs");