chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java - Issue 2560043002: ControlContainer is now a child of CompositorViewHolder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

Issue 2560043002: ControlContainer is now a child of CompositorViewHolder (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

index c9a7aef110a9fe22febc444bfbeb03ff6964f9ef..84a77aad5d304c0f1fb4d3f9512ec6115bdbf16b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

@@ -259,7 +259,7 @@ public class ToolbarControlContainer extends FrameLayout implements ControlConta

@Override

public boolean onInterceptTouchEvent(MotionEvent event) {

- if (mSwipeHandler == null) return false;

+ if (mSwipeHandler == null || isOnTabStrip(event)) return false;

return mSwipeRecognizer.onTouchEvent(event);

}