chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 2410603002: Inflate toolbar layouts in ControlContainer

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 2410603002: Inflate toolbar layouts in ControlContainer (Closed)

Patch Set: fix custom tabs Created 4 years, 2 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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java » ('J')
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 49875c2aacfcb87229b1d106cfaa906d0deb06b9..e9e8d15eac5f094596af2a42433d2d6aba00fb20 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

@@ -609,6 +609,11 @@ public class CustomTabActivity extends ChromeActivity {

}

@Override

+ protected int getToolbarLayoutId() {

+ return R.layout.custom_tabs_toolbar;

+ }

+ @Override

public int getControlContainerHeightResource() {

return R.dimen.custom_tabs_control_container_height;

}