chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 1509713004: Add a default share button to the menu of Custom Tabs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Issue 1509713004: Add a default share button to the menu of Custom Tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 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 | « chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

index ecd2e585638e57aa49d9d8a7834433a7db6341db..6081c641843cbc12f3a4cbda3617054b59c727a5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -366,7 +366,8 @@ public class CustomTabActivity extends ChromeActivity {

@Override

protected AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {

- return new CustomTabAppMenuPropertiesDelegate(this, mIntentDataProvider.getMenuTitles());

+ return new CustomTabAppMenuPropertiesDelegate(this, mIntentDataProvider.getMenuTitles(),

+ mIntentDataProvider.shouldShowShareMenuItem());

}

@Override

@@ -453,7 +454,7 @@ public class CustomTabActivity extends ChromeActivity {

public boolean onOptionsItemSelected(MenuItem item) {

int menuIndex = getAppMenuPropertiesDelegate().getIndexOfMenuItem(item);

if (menuIndex >= 0) {

- mIntentDataProvider.clickMenuItemWithUrl(getApplicationContext(), menuIndex,

+ mIntentDataProvider.clickMenuItemWithUrl(this, menuIndex,

getTabModelSelector().getCurrentTab().getUrl());

RecordUserAction.record("CustomTabsMenuCustomMenuItem");

return true;