Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
index 9be40bf1729da5ed8cb8703e03da08eb32774967..2bdabec603eb555222c56e4a97c65ee95acf0519 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java |
@@ -179,7 +179,7 @@ |
mOverviewModeObservers = new ObserverList<OverviewModeObserver>(); |
// Build Event Filter Handlers |
- mToolbarSwipeHandler = new ToolbarSwipeHandler(this); |
+ mToolbarSwipeHandler = createToolbarSwipeHandler(this); |
// Build Event Filters |
mBlackHoleEventFilter = new BlackHoleEventFilter(context, this); |
@@ -685,11 +685,13 @@ |
return false; |
} |
- boolean isAccessibility = |
- DeviceClassManager.isAccessibilityModeEnabled(mHost.getContext()); |
- return direction == ScrollDirection.LEFT || direction == ScrollDirection.RIGHT |
- || (direction == ScrollDirection.DOWN && mOverviewLayout != null |
- && !isAccessibility); |
+ if (direction == ScrollDirection.DOWN) { |
+ boolean isAccessibility = |
+ DeviceClassManager.isAccessibilityModeEnabled(mHost.getContext()); |
+ return mOverviewLayout != null && !isAccessibility; |
+ } |
+ |
+ return direction == ScrollDirection.LEFT || direction == ScrollDirection.RIGHT; |
} |
} |