Unified Bookmarks and Recent Tabs signin methods.

chrome/android/java/res/layout/signin_and_sync_view.xml

Index: chrome/android/java/res/layout/signin_and_sync_view.xml
diff --git a/chrome/android/java/res/layout/bookmark_promo_header.xml b/chrome/android/java/res/layout/signin_and_sync_view.xml
similarity index 82%
rename from chrome/android/java/res/layout/bookmark_promo_header.xml
rename to chrome/android/java/res/layout/signin_and_sync_view.xml
index 26cf50320982bed340a9b119474e6e3a7e179abe..07c22576adb0e6575615c6e44fcf2805b63ae17c 100644
--- a/chrome/android/java/res/layout/bookmark_promo_header.xml
+++ b/chrome/android/java/res/layout/signin_and_sync_view.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2015 The Chromium Authors. All rights reserved.
-
+<!-- Copyright 2016 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.
--->
+     found in the LICENSE file. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -16,7 +13,7 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/bookmark_sign_in_promo_title"
+        android:layout_marginBottom="8dp"
         android:textColor="@color/default_text_color"
         android:textSize="16sp"
         android:textStyle="bold" />
@@ -25,8 +22,6 @@
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/bookmark_sign_in_promo_description"
         android:textColor="@color/default_text_color"
         android:textSize="14sp" />
 
@@ -43,7 +38,7 @@
             style="@style/ButtonCompatBorderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/bookmark_sign_in_promo_no_thanks"
+            android:text="@string/no_thanks"
             android:textAllCaps="true"
             android:textColor="@color/light_active_color"
             android:textSize="15sp" />
@@ -52,7 +47,6 @@
             android:id="@+id/sign_in"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/bookmark_sign_in_promo_sign_in"
             android:textAllCaps="true"
             android:textColor="@android:color/white"
             android:textSize="15sp"