| 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 dc3c7dc06fcf98a5628fd7740e52190c4ccd9b5d..a3cf5dd68ea8d57df6c67930e1bfc3f7043b450f 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
|
| @@ -78,7 +78,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.content_public.common.Referrer;
|
| import org.chromium.ui.base.PageTransition;
|
| -import org.chromium.ui.base.WindowAndroid;
|
| +import org.chromium.ui.base.ViewRoot;
|
|
|
| /**
|
| * The activity for custom tabs. It will be launched on top of a client's task.
|
| @@ -150,9 +150,9 @@ public class CustomTabActivity extends ChromeActivity {
|
| private final BrowserStateBrowserControlsVisibilityDelegate mVisibilityDelegate;
|
|
|
| public CustomTabCreator(
|
| - ChromeActivity activity, WindowAndroid nativeWindow, boolean incognito,
|
| + ChromeActivity activity, ViewRoot viewRoot, boolean incognito,
|
| boolean supportsUrlBarHiding, boolean isOpenedByChrome) {
|
| - super(activity, nativeWindow, incognito);
|
| + super(activity, viewRoot, incognito);
|
| mSupportsUrlBarHiding = supportsUrlBarHiding;
|
| mIsOpenedByChrome = isOpenedByChrome;
|
| mVisibilityDelegate = activity.getFullscreenManager().getBrowserVisibilityDelegate();
|
| @@ -370,11 +370,11 @@ public class CustomTabActivity extends ChromeActivity {
|
| protected Pair<CustomTabCreator, CustomTabCreator> createTabCreators() {
|
| return Pair.create(
|
| new CustomTabCreator(
|
| - this, getWindowAndroid(), false,
|
| + this, getViewRoot(), false,
|
| mIntentDataProvider.shouldEnableUrlBarHiding(),
|
| mIntentDataProvider.isOpenedByChrome()),
|
| new CustomTabCreator(
|
| - this, getWindowAndroid(), true,
|
| + this, getViewRoot(), true,
|
| mIntentDataProvider.shouldEnableUrlBarHiding(),
|
| mIntentDataProvider.isOpenedByChrome()));
|
| }
|
| @@ -514,7 +514,7 @@ public class CustomTabActivity extends ChromeActivity {
|
| if (referrer != null) referrerUrl = referrer.getUrl();
|
| }
|
| Tab tab = new Tab(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID),
|
| - Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
|
| + Tab.INVALID_TAB_ID, false, this, getViewRoot(),
|
| TabLaunchType.FROM_EXTERNAL_APP, null, null);
|
| tab.setAppAssociatedWith(customTabsConnection.getClientPackageNameForSession(mSession));
|
|
|
|
|