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

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

Issue 2663373003: [Android] Add options in the context menu of CCT to open in a new Chrome tab or incoginto tab (Closed)
Patch Set: Rebase to master branch. Created 3 years, 10 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
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 bf752e3ea1002fcd33d3a72c980ce8a23f4617c3..78d80e75ba6df048cb8972010aa202d3e012bb52 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
@@ -18,6 +18,7 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.UrlConstants;
import org.chromium.chrome.browser.firstrun.FirstRunStatus;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.util.UrlUtilities;
@@ -76,8 +77,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
// Additional items for custom tabs mode.
private static final int[] CUSTOM_TAB_MODE_WHITELIST = {
- R.id.contextmenu_open_image,
- R.id.contextmenu_search_by_image
+ R.id.contextmenu_open_image, R.id.contextmenu_search_by_image,
+ R.id.contextmenu_open_in_new_chrome_tab, R.id.contextmenu_open_in_chrome_incognito_tab,
+ R.id.contextmenu_open_in_browser_id,
};
// Additional items for fullscreen tabs mode.
@@ -319,6 +321,14 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
removeUnsupportedItems(menu, FULLSCREEN_TAB_MODE_WHITELIST);
} else if (mMode == CUSTOM_TAB_MODE) {
removeUnsupportedItems(menu, CUSTOM_TAB_MODE_WHITELIST);
+ MenuItem defaultOpenMenuItem = menu.findItem(R.id.contextmenu_open_in_browser_id);
+ if (ChromePreferenceManager.getInstance().getCachedChromeDefaultBrowser()) {
+ defaultOpenMenuItem.setVisible(false);
+ } else {
+ menu.findItem(R.id.contextmenu_open_in_new_chrome_tab).setVisible(false);
+ menu.findItem(R.id.contextmenu_open_in_chrome_incognito_tab).setVisible(false);
+ defaultOpenMenuItem.setTitle(mDelegate.getTitleForOpenTabInExternalApp());
+ }
} else {
removeUnsupportedItems(menu, NORMAL_MODE_WHITELIST);
}
@@ -427,6 +437,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
helper.shareImage();
} else if (itemId == R.id.menu_id_open_in_chrome) {
mDelegate.onOpenInChrome(params.getLinkUrl(), params.getPageUrl());
+ } else if (itemId == R.id.contextmenu_open_in_new_chrome_tab) {
+ mDelegate.onOpenInNewChromeTabFromCCT(params.getLinkUrl(), false);
+ } else if (itemId == R.id.contextmenu_open_in_chrome_incognito_tab) {
+ mDelegate.onOpenInNewChromeTabFromCCT(params.getLinkUrl(), true);
+ } else if (itemId == R.id.contextmenu_open_in_browser_id) {
+ mDelegate.onOpenInDefaultBrowser(params.getLinkUrl());
} else {
assert false;
}

Powered by Google App Engine
This is Rietveld 408576698