chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java - Issue 199733002: Cleanup AppMenu code.

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/appmenu/AppMenuButtonHelper.java

Issue 199733002: Cleanup AppMenu code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move lint suppression to AppMenuDragHelper Created 6 years, 9 months 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

index 3c78c2e8909be696f7c63567b35e9dda303a0499..baad0991246fcae354ac009994c90ee9959bfcad 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

@@ -114,9 +114,9 @@ public class AppMenuButtonHelper extends SimpleOnGestureListener implements OnTo

// If user starts to drag on this menu button, ACTION_DOWN and all the subsequent touch

// events are received here. We need to forward this event to the app menu to handle

// dragging correctly.

- AppMenu menu = mMenuHandler.getAppMenu();

- if (menu != null && !isTouchEventConsumed) {

- isTouchEventConsumed |= menu.handleDragging(event);

+ AppMenuDragHelper dragHelper = mMenuHandler.getAppMenuDragHelper();

+ if (dragHelper != null && !isTouchEventConsumed) {

+ isTouchEventConsumed |= dragHelper.handleDragging(event);

}

return isTouchEventConsumed;

}