| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java
|
| index 28523ccec2792ee243997cc379529bedd2249f5c..bf27921f2866bfbde8bb865122a8e89b68674da9 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java
|
| @@ -107,7 +107,7 @@ public abstract class SelectableItemView<E> extends FrameLayout implements Check
|
| public final void onClick(View view) {
|
| assert view == this;
|
|
|
| - if (mSelectionDelegate.isSelectionEnabled()) {
|
| + if (isSelectionEnabled()) {
|
| onLongClick(view);
|
| } else {
|
| onClick();
|
| @@ -118,11 +118,27 @@ public abstract class SelectableItemView<E> extends FrameLayout implements Check
|
| @Override
|
| public boolean onLongClick(View view) {
|
| assert view == this;
|
| - boolean checked = mSelectionDelegate.toggleSelectionForItem(mItem);
|
| + boolean checked = toggleSelectionForItem(mItem);
|
| setChecked(checked);
|
| return true;
|
| }
|
|
|
| + /**
|
| + * @return Whether we are currently in selection mode.
|
| + */
|
| + protected boolean isSelectionEnabled() {
|
| + return mSelectionDelegate.isSelectionEnabled();
|
| + }
|
| +
|
| + /**
|
| + * Toggles the selection state for a given item.
|
| + * @param item The given item.
|
| + * @return Whether the item was in selected state after the toggle.
|
| + */
|
| + protected boolean toggleSelectionForItem(E item) {
|
| + return mSelectionDelegate.toggleSelectionForItem(item);
|
| + }
|
| +
|
| // Checkable implementations.
|
| @Override
|
| public boolean isChecked() {
|
|
|