ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java
index dd7fcc7bfa11c477c91187aa3782121573873f7a..44e2b6012fd68af1de868ae70b44c35e5f57ddeb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java
@@ -11,6 +11,8 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import org.chromium.chrome.R;
+
 /**
  * Default {@link Behavior} for widgets that are children of {@link CompositorViewHolder} and want
  * to handle touch events.
@@ -34,6 +36,11 @@ public class CompositorViewHolderBehavior extends Behavior<View> {
 
     @Override
     public boolean onInterceptTouchEvent(CoordinatorLayout parent, View child, MotionEvent ev) {
+        // If any events are above where the tab strip is, ignore them.
+        // TODO(mdjones): Refactor control container so that it's height does not include the tab
+        // strip. This will eliminate the need for the below line.
+        if (parent.getResources().getDimension(R.dimen.tab_strip_height) > ev.getY()) return false;
+
         mShouldIntercept = child.getVisibility() == View.VISIBLE && isTouchInBound(ev, child);
         return mShouldIntercept;
     }
@@ -48,8 +55,8 @@ public class CompositorViewHolderBehavior extends Behavior<View> {
         // Yet currently CompositorViewHolder does not scroll.
         if (!mShouldIntercept || ev.getActionMasked() == MotionEvent.ACTION_CANCEL) return false;
         ev.offsetLocation(-child.getX(), -child.getY());
-        child.dispatchTouchEvent(ev);
-        return true;
+
+        return child.dispatchTouchEvent(ev);

[Ian Wen, 2016/12/09 19:03:06]

This change will make views beneath snackbars to be clickable when snackbar is
on top. (If you click the empty area of the snackbar and the webcontents beneath
it will be clicked). And thus this is not a desirable behavior.

Is there any reason you wanted this?

[mdjones, 2016/12/09 21:48:11]

Originally I added it to test something related to filtering. It didn't seem to
have an impact and seemed more correct so I left it.

Reverted it to the previous version.

     }
 
     /**