chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 1203223003: Replace return button with close button on custom tab toolbar

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 1203223003: Replace return button with close button on custom tab toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/android/java/res/layout/custom_tabs_toolbar.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.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 80b95e5b5193a530d034ca30453c406c3090c027..7b62c75822dcc747b7c9ebe8afdcdca01bf90521 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

@@ -117,6 +117,7 @@ public class CustomTabActivity extends ChromeActivity {

@Override

public void postInflationStartup() {

super.postInflationStartup();

+ getToolbarManager().setCloseButtonIcon(mIntentDataProvider.getCloseButtonIconResId());

getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()

== CustomTabIntentDataProvider.CUSTOM_TAB_SHOW_PAGE_TITLE);

getToolbarManager().updatePrimaryColor(mIntentDataProvider.getToolbarColor());