chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 1871433002: Alternative fix for FindToolbar crash when reparenting.

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 1871433002: Alternative fix for FindToolbar crash when reparenting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile and rebase Created 4 years, 8 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/ChromeTabbedActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.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 788662b9bde5c44388cc75846e53294fc5e8d980..c0780f68d56fb856c99256e3256d739c7ea59480 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

@@ -268,7 +268,7 @@ public class CustomTabActivity extends ChromeActivity {

LayoutManagerDocument layoutDriver = new CustomTabLayoutManager(getCompositorViewHolder());

initializeCompositorContent(layoutDriver, findViewById(R.id.url_bar),

(ViewGroup) findViewById(android.R.id.content), controlContainer);

- mFindToolbarManager = new FindToolbarManager(this, getTabModelSelector(),

+ mFindToolbarManager = new FindToolbarManager(this,

getToolbarManager().getActionModeController().getActionModeCallback());

if (getContextualSearchManager() != null) {

getContextualSearchManager().setFindToolbarManager(mFindToolbarManager);