Merge java_staging/src into java/src.

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

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolder.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolder.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolder.java
deleted file mode 100644
index a4f858071b7fd876633b17ce36986dcdb133a65a..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkItemsAdapter.BookmarkGrid;
-import org.chromium.chrome.browser.widget.TintedDrawable;
-import org.chromium.components.bookmarks.BookmarkId;
-
-/**
- * A view that shows a bookmark folder's title, in the enhanced bookmarks UI.
- */
-public class EnhancedBookmarkFolder extends FrameLayout implements BookmarkGrid {
-    private BookmarkId mBookmarkId;
-    private EnhancedBookmarkItemHighlightView mHighlightView;
-    private EnhancedBookmarkDelegate mDelegate;
-    private TextView mTitle;
-
-    /**
-     * Constructor for inflating from XML.
-     */
-    public EnhancedBookmarkFolder(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mHighlightView = (EnhancedBookmarkItemHighlightView) findViewById(R.id.highlight);
-        mTitle = (TextView) findViewById(R.id.title);
-
-        ApiCompatibilityUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(mTitle,
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.eb_folder),
-                null, null, null);
-    }
-
-    @Override
-    public void setBookmarkId(BookmarkId bookmarkId) {
-        mBookmarkId = bookmarkId;
-        mTitle.setText(mDelegate.getModel().getBookmarkTitle(bookmarkId));
-    }
-
-    @Override
-    public BookmarkId getBookmarkId() {
-        return mBookmarkId;
-    }
-
-    /**
-     * Sets the delegate the folder holds.
-     */
-    void setDelegate(EnhancedBookmarkDelegate delegate) {
-        mDelegate = delegate;
-    }
-
-    @Override
-    public boolean isChecked() {
-        return mHighlightView.isChecked();
-    }
-
-    @Override
-    public void toggle() {
-        setChecked(!isChecked());
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        mHighlightView.setChecked(checked);
-    }
-
-    @Override
-    public void onClick(View v) {
-        mDelegate.openFolder(mBookmarkId);
-    }
-}