chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java - Issue 2815453002: [Android] Show Browser Actions dialog in Chrome

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/contextmenu/TabularContextMenuListAdapter.java

Issue 2815453002: [Android] Show Browser Actions dialog in Chrome (Closed)

Patch Set: Fix tests fail. Created 3 years, 7 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/contextmenu/PlatformContextMenuUi.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java

index eed6bef5ca1035d0cad190acbf53a6acf44724ed..79365e32146c3977d9ad494bad2dd3cce7d39bda 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuListAdapter.java

@@ -54,7 +54,7 @@ class TabularContextMenuListAdapter extends BaseAdapter {

@Override

public long getItemId(int position) {

- return mMenuItems.get(position).menuId;

+ return mMenuItems.get(position).getMenuId();

}

@Override

@@ -79,12 +79,12 @@ class TabularContextMenuListAdapter extends BaseAdapter {

viewHolder = (ViewHolderItem) convertView.getTag();

}

- viewHolder.mText.setText(menuItem.getString(mActivity));

- Drawable icon = menuItem.getDrawableAndDescription(mActivity);

+ viewHolder.mText.setText(menuItem.getTitle(mActivity));

+ Drawable icon = menuItem.getDrawable(mActivity);

viewHolder.mIcon.setImageDrawable(icon);

viewHolder.mIcon.setVisibility(icon != null ? View.VISIBLE : View.INVISIBLE);

- if (menuItem == ContextMenuItem.SHARE_IMAGE) {

+ if (menuItem == ChromeContextMenuItem.SHARE_IMAGE) {

Intent shareIntent = ShareHelper.getShareImageIntent(null);

final Pair<Drawable, CharSequence> shareInfo =

ShareHelper.getShareableIconAndName(mActivity, shareIntent);