Unified Bookmarks and Recent Tabs signin methods.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.LruCache;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 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;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Row adapter for presenting recently closed tabs, synced tabs from other devices, the sync or
  * sign in promo, and currently open tabs (only in document mode) in a grouped list view.
  */
@@ skipping 544 matching lines @@
 
         @Override
         public Object getChild(int childPosition) {
             return null;
         }
 
         @Override
         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");
             }
             return convertView;
         }
 
         @Override
         public void configureChildView(int childPosition, ViewHolder viewHolder) {
         }
@@ skipping 232 matching lines @@
     @Override
     public int getChildType(int groupPosition, int childPosition) {
         return mGroups.get(groupPosition).getChildType().ordinal();
     }
 
     @Override
     public int getChildTypeCount() {
         return ChildType.values().length;
     }
 }