| Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
|
| index a894354e732826c9dc32d136ef5ef693e4db5dee..e37baf34cefc028a0a5470ff1c8e7034fe7160d5 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
|
| @@ -16,6 +16,7 @@ import org.chromium.base.BuildInfo;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeActivity;
|
| +import org.chromium.chrome.browser.UrlConstants;
|
| import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
|
| import org.chromium.chrome.browser.firstrun.FirstRunStatus;
|
| import org.chromium.chrome.browser.share.ShareHelper;
|
| @@ -97,6 +98,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
|
|
|
| MenuItem iconRow = menu.findItem(R.id.icon_row_menu_id);
|
| MenuItem openInChromeItem = menu.findItem(R.id.open_in_browser_id);
|
| + MenuItem bookmarkItem = menu.findItem(R.id.bookmark_this_page_id);
|
| + MenuItem downloadItem = menu.findItem(R.id.offline_page_id);
|
| + MenuItem addToHomeScreenItem = menu.findItem(R.id.add_to_homescreen_id);
|
| if (mIsMediaViewer) {
|
| // Most of the menu items don't make sense when viewing media.
|
| iconRow.setVisible(false);
|
| @@ -108,10 +112,14 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
|
| openInChromeItem.setTitle(
|
| mActivity.getString(R.string.menu_open_in_product_default));
|
| }
|
| + updateBookmarkMenuItem(bookmarkItem, currentTab);
|
| }
|
|
|
| if (!FirstRunStatus.getFirstRunFlowComplete()) {
|
| openInChromeItem.setVisible(false);
|
| + bookmarkItem.setVisible(false);
|
| + downloadItem.setVisible(false);
|
| + addToHomeScreenItem.setVisible(false);
|
| }
|
|
|
| // Add custom menu items. Make sure they are only added once.
|
| @@ -122,6 +130,14 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
|
| mItemToIndexMap.put(item, i);
|
| }
|
| }
|
| +
|
| + // Hide request desktop site on all chrome:// pages except for the NTP. Check request
|
| + // desktop site if it's activated on this page.
|
| + MenuItem requestItem = menu.findItem(R.id.request_desktop_site_id);
|
| + String url = currentTab.getUrl();
|
| + boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_SCHEME)
|
| + || url.startsWith(UrlConstants.CHROME_NATIVE_SCHEME);
|
| + updateRequestDesktopSiteMenuItem(requestItem, currentTab, isChromeScheme);
|
| }
|
| }
|
|
|
|
|