Implement additional parts of the new ui for CBD.

chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
index 1ad2a640fd97594db63ae641a4ee767e5bfa86f5..29da31a64640a0c7c65da60352a371d2b1bfb472 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
@@ -30,7 +31,13 @@ public class SpinnerPreference extends Preference {
      */
     public SpinnerPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayoutResource(R.layout.preference_spinner);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SpinnerPreference);
+        boolean single_line = a.getBoolean(R.styleable.SpinnerPreference_singleLine, false);
+        if (single_line) {
+            setLayoutResource(R.layout.preference_spinner_single_line);
+        } else {
+            setLayoutResource(R.layout.preference_spinner);
+        }
     }
 
     /**
@@ -40,8 +47,7 @@ public class SpinnerPreference extends Preference {
      * @param selectedIndex Index of the initially selected option.
      */
     public void setOptions(Object[] options, int selectedIndex) {
-        mAdapter = new ArrayAdapter<Object>(
-                getContext(), android.R.layout.simple_spinner_item, options);
+        mAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, options);
         mAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mSelectedIndex = selectedIndex;
     }