Unified Bookmarks and Recent Tabs signin methods.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
index d8f70472f5905ea4426c089fee6e37faa92ad38e..307398da2e05c694bb020e9f0902bd05d86f6fe0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
@@ -112,7 +112,6 @@ public class AccountSigninView
     private boolean mSignedIn;
     private int mCancelButtonTextId;
     private boolean mIsChildAccount;
-    private boolean mShowSettingsSpan = true;
 
     private AccountSigninConfirmationView mSigninConfirmationView;
     private ImageView mSigninAccountImage;
@@ -251,8 +250,6 @@ public class AccountSigninView
      * This is currently used in the Recent Tabs Promo and the bookmarks page.
      */
     public void configureForRecentTabsOrBookmarksPage() {
-        mShowSettingsSpan = false;
-
         setBackgroundResource(R.color.ntp_bg);
         mCancelButtonTextId = R.string.cancel;
         setUpCancelButton();
@@ -408,22 +405,15 @@ public class AccountSigninView
         setPositiveButtonDisabled();
         setUpUndoButton();
 
-        if (mShowSettingsSpan) {
-            NoUnderlineClickableSpan settingsSpan = new NoUnderlineClickableSpan() {
-                @Override
-                public void onClick(View widget) {
-                    mListener.onAccountSelected(getSelectedAccountName(), true);
-                }
-            };
-            mSigninSettingsControl.setText(
-                    SpanApplier.applySpans(getSettingsControlDescription(mIsChildAccount),
-                            new SpanInfo(SETTINGS_LINK_OPEN, SETTINGS_LINK_CLOSE, settingsSpan)));
-        } else {
-            // If we aren't showing the span, get rid of the LINK1 annotations.
-            mSigninSettingsControl.setText(getSettingsControlDescription(mIsChildAccount)
-                                                   .replace(SETTINGS_LINK_OPEN, "")
-                                                   .replace(SETTINGS_LINK_CLOSE, ""));
-        }
+        NoUnderlineClickableSpan settingsSpan = new NoUnderlineClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                mListener.onAccountSelected(getSelectedAccountName(), true);
+            }
+        };
+        mSigninSettingsControl.setText(
+                SpanApplier.applySpans(getSettingsControlDescription(mIsChildAccount),
+                        new SpanInfo(SETTINGS_LINK_OPEN, SETTINGS_LINK_CLOSE, settingsSpan)));
     }
 
     private void showConfirmSigninPageAccountTrackerServiceCheck() {