chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.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/CustomTabsConnection.java

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)

Patch Set: fix ID 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.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/CustomTabsConnection.java

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

index 435a0b84c95df0fc6a63638915b75c61ad2702f9..bb535d8fcebeece0de3bc7cbd71500812feb5e23 100644

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

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

@@ -185,7 +185,7 @@ public class CustomTabsConnection {

}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);

ChromeBrowserInitializer.initNetworkChangeNotifier(context);

WarmupManager.getInstance().initializeViewHierarchy(

- context, R.layout.custom_tabs_control_container);

+ context, R.layout.custom_tabs_control_container, R.layout.custom_tabs_toolbar);

}

public boolean warmup(long flags) {