chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java - Issue 1371553002: Remove mActivity from Tab and look at windowAndroid for tab

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/CustomTab.java

Issue 1371553002: Remove mActivity from Tab and look at windowAndroid for tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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/banners/AppBannerManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/document/DocumentTab.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/CustomTab.java

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

index 4422df5dac0c942baa9116dd13ca2c799bb9ebba..82fb0ac332f49ef02da8e54e1af5e6854d4b4cea 100644

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

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

@@ -199,9 +199,10 @@ public class CustomTab extends ChromeTab {

@Override

protected InterceptNavigationDelegateImpl createInterceptNavigationDelegate() {

- mNavigationDelegate = new CustomTabNavigationDelegate(mActivity);

+ assert getActivity() != null;

+ mNavigationDelegate = new CustomTabNavigationDelegate(getActivity());

mNavigationHandler = new ExternalNavigationHandler(mNavigationDelegate);

- return new InterceptNavigationDelegateImpl(mNavigationHandler, mActivity, this);

+ return new InterceptNavigationDelegateImpl(mNavigationHandler, getActivity(), this);

}

/**