| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
|
| index bf16bf7071f667ec12561e3d5048db6a7ca8bb0f..9a6a8f7fcbb8a22de9a71b262db4c807f942af04 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java
|
| @@ -78,9 +78,9 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
|
|
|
| protected boolean mIsSelectionEnabled;
|
| protected SelectionDelegate<E> mSelectionDelegate;
|
| + protected boolean mIsSearching;
|
|
|
| private boolean mHasSearchView;
|
| - private boolean mIsSearching;
|
| private LinearLayout mSearchView;
|
| private EditText mSearchEditText;
|
| private TintedImageButton mClearTextButton;
|
| @@ -313,7 +313,8 @@ public class SelectableListToolbar<E> extends Toolbar implements SelectionObserv
|
|
|
| if (mActionBarDrawerToggle != null) {
|
| mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
|
| - mDrawerLayout.addDrawerListener(null);
|
| + mDrawerLayout.removeDrawerListener(mActionBarDrawerToggle);
|
| + mActionBarDrawerToggle = null;
|
| }
|
|
|
| setNavigationOnClickListener(this);
|
|
|