| 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 279ac2537ccac6fab25ed66dce892a186a6e6f70..f848181b6991893de721fb43fbea374d41acd421 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
|
| @@ -401,8 +401,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_OTHER_WINDOW);
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_NEW_TAB);
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_INCOGNITO_TAB);
|
| - disabledOptions.add(ContextMenuItem.OPEN_IN_CHROME_INCOGNITO_TAB);
|
| - disabledOptions.add(ContextMenuItem.OPEN_IN_NEW_CHROME_TAB);
|
| }
|
|
|
| if (MailTo.isMailTo(params.getLinkUrl())) {
|
| @@ -484,7 +482,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| if (mMode == CUSTOM_TAB_MODE) {
|
| try {
|
| URI uri = new URI(getUrl(params));
|
| - if (UrlUtilities.isInternalScheme(uri)) {
|
| + if (UrlUtilities.isInternalScheme(uri) || isEmptyUrl(getUrl(params))) {
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_NEW_CHROME_TAB);
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_CHROME_INCOGNITO_TAB);
|
| disabledOptions.add(ContextMenuItem.OPEN_IN_BROWSER_ID);
|
| @@ -607,6 +605,18 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| }
|
|
|
| /**
|
| + * Checks whether a url is empty or blank.
|
| + * @param url The url need to be checked.
|
| + * @return True if the url is empty or "about:blank".
|
| + */
|
| + private boolean isEmptyUrl(String url) {
|
| + if (TextUtils.isEmpty(url) || url.equals(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL)) {
|
| + return true;
|
| + }
|
| + return false;
|
| + }
|
| +
|
| + /**
|
| * The valid url of a link is stored in the linkUrl of ContextMenuParams while the
|
| * valid url of a image or video is stored in the srcUrl of ContextMenuParams.
|
| * @param params The parameters used to decide the type of the content.
|
|
|