Cleanup AppMenu code.

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java

Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java
new file mode 100644
index 0000000000000000000000000000000000000000..eddcc0dae127b17f0048aa8e1dc62c020f89bc07
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuItemIcon.java
@@ -0,0 +1,46 @@
+// Copyright 2014 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.appmenu;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+/**
+ * A menu icon that supports the checkable state.
+ */
+class AppMenuItemIcon extends ImageView {
+    private static final int[] CHECKED_STATE_SET = new int[] {android.R.attr.state_checked};
+    private boolean mCheckedState;
+
+    public AppMenuItemIcon(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Sets whether the item is checked and refreshes the View if necessary.
+     */
+    protected void setChecked(boolean state) {
+        if (state == mCheckedState) return;
+        mCheckedState = state;
+        refreshDrawableState();
+    }
+
+    @Override
+    public void setPressed(boolean state) {
+        // We don't want to highlight the checkbox icon since the parent item is already
+        // highlighted.
+        return;
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+        if (mCheckedState) {
+            mergeDrawableStates(drawableState, CHECKED_STATE_SET);
+        }
+        return drawableState;
+    }
+}