Revert of chrome/android: Push EventFilters into the Layout implementations.

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java

 // 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.compositor.layouts;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.RectF;
+import android.view.MotionEvent;
 import android.view.ViewGroup;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.AreaGestureEventFilter;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureHandler;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
 import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 
 import java.util.List;
 
 /**
  * {@link LayoutManagerChromeTablet} is the specialization of {@link LayoutManagerChrome} for
  * the tablet.
  */
 public class LayoutManagerChromeTablet extends LayoutManagerChrome {
+    // Event Filters
+    private final TabStripEventFilter mTabStripFilter;
+
     // Internal State
     private final String mDefaultTitle;
 
     private StripLayoutHelperManager mTabStripLayoutHelperManager;
     private TabModelSelectorTabObserver mTabObserver;
 
     /**
      * Creates an instance of a {@link LayoutManagerChromePhone}.
      * @param host                     A {@link LayoutManagerHost} instance.
      */
     public LayoutManagerChromeTablet(LayoutManagerHost host) {
         super(host, false);
         Context context = host.getContext();
 
-        mTabStripLayoutHelperManager =
-                new StripLayoutHelperManager(context, this, mHost.getLayoutRenderHost());
+        // Build Event Filters
+        mTabStripFilter =
+                new TabStripEventFilter(context, new TabStripEventHandler(), null, false, false);
+
+        mTabStripLayoutHelperManager = new StripLayoutHelperManager(
+                context, this, mHost.getLayoutRenderHost(), mTabStripFilter);
 
         // Set up state
         mDefaultTitle = context.getString(R.string.tab_loading_default_title);
 
 
         setNextLayout(null);
     }
 
     @Override
     protected void addAllSceneOverlays() {
@@ skipping 131 matching lines @@
         public boolean isSwipeEnabled(ScrollDirection direction) {
             if ((direction == ScrollDirection.LEFT || direction == ScrollDirection.RIGHT)
                     && (getTabModelSelector() == null
                                || getTabModelSelector().getCurrentModel().getCount() <= 1)) {
                 return false;
             }
 
             return super.isSwipeEnabled(direction);
         }
     }
+
+    private class TabStripEventHandler implements GestureHandler {
+        @Override
+        public void onDown(float x, float y, boolean fromMouse, int buttons) {
+            mTabStripLayoutHelperManager.onDown(time(), x, y, fromMouse, buttons);
+        }
+
+        @Override
+        public void onUpOrCancel() {
+            mTabStripLayoutHelperManager.onUpOrCancel(time());
+        }
+
+        @Override
+        public void drag(float x, float y, float dx, float dy, float tx, float ty) {
+            mTabStripLayoutHelperManager.drag(time(), x, y, dx, dy, tx, ty);
+        }
+
+        @Override
+        public void click(float x, float y, boolean fromMouse, int buttons) {
+            mTabStripLayoutHelperManager.click(time(), x, y, fromMouse, buttons);
+        }
+
+        @Override
+        public void fling(float x, float y, float velocityX, float velocityY) {
+            mTabStripLayoutHelperManager.fling(time(), x, y, velocityX, velocityY);
+        }
+
+        @Override
+        public void onLongPress(float x, float y) {
+            mTabStripLayoutHelperManager.onLongPress(time(), x, y);
+        }
+
+        @Override
+        public void onPinch(float x0, float y0, float x1, float y1, boolean firstEvent) {
+            // Not implemented.
+        }
+    }
+
+    private class TabStripEventFilter extends AreaGestureEventFilter {
+        public TabStripEventFilter(Context context, GestureHandler handler, RectF triggerRect,
+                boolean autoOffset, boolean useDefaultLongPress) {
+            super(context, handler, triggerRect, autoOffset, useDefaultLongPress);
+        }
+
+        @Override
+        public boolean onInterceptTouchEventInternal(MotionEvent e, boolean isKeyboardShowing) {
+            if (getActiveLayout().isTabStripEventFilterEnabled()) {
+                return super.onInterceptTouchEventInternal(e, isKeyboardShowing);
+            }
+
+            return false;
+        }
+    }
 }