Upstream oodles of Chrome for Android code into Chromium.

chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml

Index: chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml
diff --git a/chrome/android/java/res/layout/preference_button.xml b/chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml
similarity index 50%
copy from chrome/android/java/res/layout/preference_button.xml
copy to chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml
index 6d94d4b6eb53183fdc1e48a05a5a024f3238ef90..a7325168079e4a14f0fcb0a2190791c73a220a1b 100644
--- a/chrome/android/java/res/layout/preference_button.xml
+++ b/chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml
@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+<!-- 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. -->
 
-<!-- Layout used by ButtonPreference for the button widget style. -->
-
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
-    style="@style/PreferenceLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingTop="10dp"
+    android:paddingBottom="28dp" >
 
-    <org.chromium.chrome.browser.widget.ButtonCompat
-        android:id="@+id/button_preference"
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textSize="14sp" />
+
+    <org.chromium.chrome.browser.widget.ButtonCompat
+        android:id="@+id/enable_sync_button"
         android:layout_width="wrap_content"
-        android:minHeight="40dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/ntp_recent_tabs_sync_enable_sync_button"
         android:textColor="#fff"
-        chrome:buttonColor="@color/pref_accent_color" />
+        chrome:buttonColor="@color/light_active_color" />
 
 </LinearLayout>