Upstream oodles of Chrome for Android code into Chromium.

chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d1fa9b5ae6f509fcb71440fe1767285243bc201
--- /dev/null
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
@@ -0,0 +1,36 @@
+// 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.
+
+package org.chromium.chrome.browser.enhancedbookmarks;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.AppCompatTextView;
+import android.util.AttributeSet;
+
+import com.google.android.apps.chrome.R;
+
+import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.chrome.browser.widget.TintedDrawable;
+
+@SuppressLint("Instantiatable")
+class EnhancedBookmarkDrawerListItemView extends AppCompatTextView {
+    public EnhancedBookmarkDrawerListItemView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    void setIcon(int iconDrawableId) {
+        if (iconDrawableId == 0) {
+            setCompoundDrawablePadding(0);
+        } else {
+            setCompoundDrawablePadding(getResources().getDimensionPixelSize(
+                    R.dimen.enhanced_bookmark_drawer_drawable_padding));
+        }
+
+        Drawable drawable = TintedDrawable.constructTintedDrawable(getResources(), iconDrawableId);
+        ApiCompatibilityUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                this, drawable, null, null, null);
+    }
+}