Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

Issue 115323006: [Android] Fix crash on opening context menu without default search engine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8fd4d58dbfe9fe87dcd8fe2471391ca2378a74b0..2d29dc510ee74b628dfc200a7498062ade36ac68 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
@@ -72,14 +72,15 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
menu.findItem(R.id.contextmenu_open_image_in_new_tab).setVisible(false);
}
- final boolean templateServiceUsable = TemplateUrlService.getInstance().isLoaded();
- final boolean searchByImageVisible = templateServiceUsable &&
+ final TemplateUrlService templateUrlServiceInstance = TemplateUrlService.getInstance();
+ final boolean isSearchByImageAvailable =
UrlUtilities.isDownloadableScheme(params.getSrcUrl()) &&
- TemplateUrlService.getInstance().isSearchByImageAvailable();
+ templateUrlServiceInstance.isLoaded() &&
+ templateUrlServiceInstance.isSearchByImageAvailable() &&
+ templateUrlServiceInstance.getDefaultSearchEngineTemplateUrl() != null;
- menu.findItem(R.id.contextmenu_search_by_image).setVisible(searchByImageVisible);
-
- if (templateServiceUsable) {
+ 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().
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698