| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java
|
| index 1f9763d9ed062919f6747fbf693a145af6d50e7c..c2eeffed7ec993a14d4da96d3d06ede858011c5b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java
|
| @@ -6,124 +6,29 @@ package org.chromium.chrome.browser.contextmenu;
|
|
|
| import android.content.Context;
|
| import android.graphics.drawable.Drawable;
|
| -import android.support.annotation.DrawableRes;
|
| import android.support.annotation.IdRes;
|
| -import android.support.annotation.StringRes;
|
| -
|
| -import org.chromium.base.ApiCompatibilityUtils;
|
| -import org.chromium.chrome.R;
|
| -import org.chromium.chrome.browser.DefaultBrowserInfo;
|
| -import org.chromium.chrome.browser.search_engines.TemplateUrlService;
|
| -import org.chromium.chrome.browser.widget.TintedDrawable;
|
|
|
| /**
|
| - * List of all Context Menu Items available in Chrome.
|
| + * An interface to get information of context menu.
|
| */
|
| -public enum ContextMenuItem {
|
| - // Custom Tab Group
|
| - OPEN_IN_NEW_CHROME_TAB(R.drawable.context_menu_new_tab,
|
| - R.string.contextmenu_open_in_new_chrome_tab, R.id.contextmenu_open_in_new_chrome_tab),
|
| - OPEN_IN_CHROME_INCOGNITO_TAB(R.drawable.incognito_statusbar,
|
| - R.string.contextmenu_open_in_chrome_incognito_tab,
|
| - R.id.contextmenu_open_in_chrome_incognito_tab),
|
| - OPEN_IN_BROWSER_ID(R.drawable.context_menu_new_tab, 0, R.id.contextmenu_open_in_browser_id),
|
| -
|
| - // Link Group
|
| - OPEN_IN_OTHER_WINDOW(R.drawable.context_menu_new_tab, R.string.contextmenu_open_in_other_window,
|
| - R.id.contextmenu_open_in_other_window),
|
| - OPEN_IN_NEW_TAB(R.drawable.context_menu_new_tab, R.string.contextmenu_open_in_new_tab,
|
| - R.id.contextmenu_open_in_new_tab),
|
| - OPEN_IN_INCOGNITO_TAB(R.drawable.incognito_statusbar,
|
| - R.string.contextmenu_open_in_incognito_tab, R.id.contextmenu_open_in_incognito_tab),
|
| - COPY_LINK_ADDRESS(R.drawable.ic_content_copy, R.string.contextmenu_copy_link_address,
|
| - R.id.contextmenu_copy_link_address),
|
| - COPY_LINK_TEXT(R.drawable.ic_content_copy, R.string.contextmenu_copy_link_text,
|
| - R.id.contextmenu_copy_link_text),
|
| - SAVE_LINK_AS(R.drawable.ic_file_download_white_24dp, R.string.contextmenu_save_link,
|
| - R.id.contextmenu_save_link_as),
|
| -
|
| - // Image Group
|
| - LOAD_ORIGINAL_IMAGE(R.drawable.context_menu_load_image,
|
| - R.string.contextmenu_load_original_image, R.id.contextmenu_load_original_image),
|
| - SAVE_IMAGE(R.drawable.ic_file_download_white_24dp, R.string.contextmenu_save_image,
|
| - R.id.contextmenu_save_image),
|
| - OPEN_IMAGE(R.drawable.context_menu_new_tab, R.string.contextmenu_open_image,
|
| - R.id.contextmenu_open_image),
|
| - OPEN_IMAGE_IN_NEW_TAB(R.drawable.context_menu_new_tab,
|
| - R.string.contextmenu_open_image_in_new_tab, R.id.contextmenu_open_image_in_new_tab),
|
| - SEARCH_BY_IMAGE(R.drawable.googleg, R.string.contextmenu_search_web_for_image,
|
| - R.id.contextmenu_search_by_image),
|
| - SHARE_IMAGE(R.drawable.ic_share_white_24dp, R.string.contextmenu_share_image,
|
| - R.id.contextmenu_share_image),
|
| -
|
| - // Message Group
|
| - CALL(R.drawable.ic_phone_googblue_36dp, R.string.contextmenu_call, R.id.contextmenu_call),
|
| - SEND_MESSAGE(R.drawable.ic_email_googblue_36dp, R.string.contextmenu_send_message,
|
| - R.id.contextmenu_send_message),
|
| - ADD_TO_CONTACTS(R.drawable.context_menu_add_to_contacts, R.string.contextmenu_add_to_contacts,
|
| - R.id.contextmenu_add_to_contacts),
|
| - COPY(R.drawable.ic_content_copy, R.string.contextmenu_copy, R.id.contextmenu_copy),
|
| -
|
| - // Video Group
|
| - SAVE_VIDEO(R.drawable.ic_file_download_white_24dp, R.string.contextmenu_save_video,
|
| - R.id.contextmenu_save_video),
|
| - // Other
|
| - OPEN_IN_CHROME(R.drawable.context_menu_new_tab, R.string.menu_open_in_chrome,
|
| - R.id.menu_id_open_in_chrome);
|
| -
|
| - @DrawableRes public final int iconId;
|
| - @StringRes public final int stringId;
|
| - @IdRes public final int menuId;
|
| -
|
| +public interface ContextMenuItem {
|
| /**
|
| - * A representation of a Context Menu Item. Each item should have a string and an id associated
|
| - * with it.
|
| - * @param iconId The icon that appears in {@link TabularContextMenuUi} to represent each item.
|
| - * @param stringId The string that describes the action of the item.
|
| - * @param menuId The id found in ids.xml.
|
| + * Gets the {@link IdRes} menuId of a context menu.
|
| */
|
| - ContextMenuItem(@DrawableRes int iconId, @StringRes int stringId, @IdRes int menuId) {
|
| - this.iconId = iconId;
|
| - this.stringId = stringId;
|
| - this.menuId = menuId;
|
| - }
|
| + @IdRes
|
| + int getMenuId();
|
|
|
| /**
|
| - * Transforms the id of the item into a string. It manages special cases that need minor
|
| - * changes due to templating.
|
| - * @param context Requires to get the string resource related to the item.
|
| - * @return Returns a string for the menu item.
|
| + * Gets the title of a context menu item.
|
| + * @param context The context required to get the title from resources.
|
| + * @return The title of the menu item.
|
| */
|
| - String getString(Context context) {
|
| - if (this == ContextMenuItem.SEARCH_BY_IMAGE) {
|
| - return context.getString(R.string.contextmenu_search_web_for_image,
|
| - TemplateUrlService.getInstance()
|
| - .getDefaultSearchEngineTemplateUrl()
|
| - .getShortName());
|
| - } else if (this == OPEN_IN_BROWSER_ID) {
|
| - return DefaultBrowserInfo.getTitleOpenInDefaultBrowser(false);
|
| - } else if (stringId == 0) {
|
| - return "";
|
| - }
|
| -
|
| - return context.getString(stringId);
|
| - }
|
| + String getTitle(Context context);
|
|
|
| /**
|
| - * Returns the drawable and the content description associated with the context menu. If no
|
| - * drawable is associated with the icon, null is returned for the drawable and the
|
| - * iconDescription.
|
| + * Gets the {@link Drawable} icon of a context menu item.
|
| + * @param context The context required to get the icon from resources.
|
| + * @return The icon of the menu item.
|
| */
|
| - Drawable getDrawableAndDescription(Context context) {
|
| - if (iconId == R.drawable.context_menu_new_tab
|
| - || iconId == R.drawable.context_menu_add_to_contacts
|
| - || iconId == R.drawable.context_menu_load_image) {
|
| - return ApiCompatibilityUtils.getDrawable(context.getResources(), iconId);
|
| - } else if (iconId == 0) {
|
| - return null;
|
| - } else {
|
| - return TintedDrawable.constructTintedDrawable(
|
| - context.getResources(), iconId, R.color.light_normal_color);
|
| - }
|
| - }
|
| -}
|
| + Drawable getDrawable(Context context);
|
| +}
|
|
|