ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java

 // Copyright 2014 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.fullscreen;
 
 import android.app.Activity;
 import android.content.res.Resources;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.FrameLayout;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.BaseChromiumApplication.WindowFocusChangedListener;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.browser.fullscreen.FullscreenHtmlApiHandler.FullscreenHtmlApiDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver;
-import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.content.browser.ContentVideoView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.common.BrowserControlsState;
 
 import java.util.ArrayList;
 
 /**
  * A class that manages control and content views to create the fullscreen mode.
  */
@@ skipping 548 matching lines @@
         mRendererTopControlOffset = rendererTopControlOffset;
         mRendererBottomControlOffset = rendererBottomControlOffset;
 
         mRendererTopContentOffset = rendererTopContentOffset;
         updateControlOffset();
 
         updateVisuals();
     }
 
     /**
-     * @param e The dispatched motion event
-     * @return Whether or not this motion event is in the top control container area and should be
-     *         consumed.
-     */
-    public boolean onInterceptMotionEvent(MotionEvent e) {
-        int bottomPosition;
-        int topPosition = 0;
-        float offset;
-
-        if (mIsBottomControls) {
-            int[] position = new int[2];
-            ViewUtils.getRelativeLayoutPosition(mControlContainer.getView().getRootView(),
-                    mControlContainer.getView(), position);
-
-            topPosition = position[1];
-            bottomPosition = topPosition + getBottomControlsHeight();
-            offset = getBottomControlOffset();
-        } else {
-            bottomPosition = getTopControlsHeight();
-            offset = getTopControlOffset();
-        }
-
-        return e.getY() < topPosition + offset && e.getY() > bottomPosition + offset
-                && !mBrowserControlsAndroidViewHidden;
-    }
-
-    /**
      * Notifies the fullscreen manager that a motion event has occurred.
      * @param e The dispatched motion event.
      */
     public void onMotionEvent(MotionEvent e) {
         int eventAction = e.getActionMasked();
         if (eventAction == MotionEvent.ACTION_DOWN
                 || eventAction == MotionEvent.ACTION_POINTER_DOWN) {
             mInGesture = true;
             // TODO(qinmin): Probably there is no need to hide the toast as it will go away
             // by itself.
             getHtmlApiHandler().hideNotificationToast();
         } else if (eventAction == MotionEvent.ACTION_CANCEL
                 || eventAction == MotionEvent.ACTION_UP) {
             mInGesture = false;
             updateVisuals();
         }
     }
 
     @Override
     public void onContentViewScrollingStateChanged(boolean scrolling) {
         mContentViewScrolling = scrolling;
         if (!scrolling) updateVisuals();
     }
 }