Merge 282206 "Visual makeover for infobars."

chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java

 // Copyright 2013 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.infobar;
 
 import android.content.Context;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import org.chromium.chrome.R;
 
 /**
  * A check box used to determine if a page should always be translated.
  */
-public class TranslateCheckBox {
+public class TranslateCheckBox extends CheckBox implements OnCheckedChangeListener {
     private final SubPanelListener mListener;
     private final TranslateOptions mOptions;
 
-    public TranslateCheckBox(TranslateOptions options, SubPanelListener listener) {
+    public TranslateCheckBox(Context context, TranslateOptions options, SubPanelListener listener) {
+        super(context);
         mOptions = options;
         mListener = listener;
+
+        setId(R.id.infobar_extra_check);
+        setText(context.getString(R.string.translate_always_text, mOptions.sourceLanguage()));
+        setChecked(mOptions.alwaysTranslateLanguageState());
+        setOnCheckedChangeListener(this);
     }
 
-    public void createContent(Context context, InfoBarLayout layout) {
-        CheckBox checkBox = new CheckBox(context);
-        checkBox.setId(R.id.infobar_extra_check);
-        checkBox.setText(context.getString(R.string.translate_always_text,
-                mOptions.sourceLanguage()));
-        checkBox.setChecked(mOptions.alwaysTranslateLanguageState());
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton view, boolean isChecked) {
-                mOptions.toggleAlwaysTranslateLanguageState(isChecked);
-                if (isChecked) {
-                    mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE);
-                } else {
-                    mListener.onOptionsChanged();
-                }
-            }
-        });
-        layout.addGroup(checkBox);
+    @Override
+    public void onCheckedChanged(CompoundButton view, boolean isChecked) {
+        mOptions.toggleAlwaysTranslateLanguageState(isChecked);
+        if (isChecked) {
+            mListener.onPanelClosed(InfoBar.ACTION_TYPE_NONE);
+        } else {
+            mListener.onOptionsChanged();
+        }
     }
 }