| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| index 25d03507c2d79a912cf1dadb8898910d3e08785a..e17fbcb3abd3ed51536077901d8da64cb368dbaa 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| @@ -87,17 +87,18 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| }
|
| final TemplateUrlService templateUrlServiceInstance = TemplateUrlService.getInstance();
|
| final boolean isSearchByImageAvailable =
|
| - UrlUtilities.isDownloadableScheme(params.getSrcUrl()) &&
|
| - templateUrlServiceInstance.isLoaded() &&
|
| - templateUrlServiceInstance.isSearchByImageAvailable() &&
|
| - templateUrlServiceInstance.getDefaultSearchEngineTemplateUrl() != null;
|
| + UrlUtilities.isDownloadableScheme(params.getSrcUrl())
|
| + && templateUrlServiceInstance.isLoaded()
|
| + && templateUrlServiceInstance.isSearchByImageAvailable()
|
| + && templateUrlServiceInstance.getDefaultSearchEngineTemplateUrl()
|
| + != null;
|
|
|
| menu.findItem(R.id.contextmenu_search_by_image).setVisible(isSearchByImageAvailable);
|
| if (isSearchByImageAvailable) {
|
| menu.findItem(R.id.contextmenu_search_by_image).setTitle(
|
| context.getString(R.string.contextmenu_search_web_for_image,
|
| - TemplateUrlService.getInstance().
|
| - getDefaultSearchEngineTemplateUrl().getShortName()));
|
| + TemplateUrlService.getInstance()
|
| + .getDefaultSearchEngineTemplateUrl().getShortName()));
|
| }
|
|
|
| menu.findItem(R.id.contextmenu_copy_image).setVisible(
|
| @@ -113,8 +114,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| mDelegate.onOpenInNewIncognitoTab(params.getLinkUrl());
|
| } else if (itemId == R.id.contextmenu_open_image) {
|
| mDelegate.onOpenImageUrl(params.getSrcUrl(), params.getReferrer());
|
| - } else if (itemId == R.id.contextmenu_open_image_in_new_tab ||
|
| - itemId == R.id.contextmenu_open_original_image_in_new_tab) {
|
| + } else if (itemId == R.id.contextmenu_open_image_in_new_tab
|
| + || itemId == R.id.contextmenu_open_original_image_in_new_tab) {
|
| mDelegate.onOpenImageInNewTab(params.getSrcUrl(), params.getReferrer());
|
| } else if (itemId == R.id.contextmenu_copy_link_address_text) {
|
| mDelegate.onSaveToClipboard(params.getUnfilteredLinkUrl(), true);
|
| @@ -122,8 +123,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| mDelegate.onSaveToClipboard(MailTo.parse(params.getLinkUrl()).getTo(), false);
|
| } else if (itemId == R.id.contextmenu_copy_link_text) {
|
| mDelegate.onSaveToClipboard(params.getLinkText(), false);
|
| - } else if (itemId == R.id.contextmenu_save_image ||
|
| - itemId == R.id.contextmenu_save_video) {
|
| + } else if (itemId == R.id.contextmenu_save_image
|
| + || itemId == R.id.contextmenu_save_video) {
|
| if (mDelegate.startDownload(params.getSrcUrl(), false)) {
|
| helper.startContextMenuDownload(false);
|
| }
|
|
|