| Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| index 0b1db2bdc2a9b9109d58cd92e81a6cfbad45cde1..8469b7d664a143dc0e843766f0fa4899657ca6d0 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| @@ -121,7 +121,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.common.Referrer;
|
| import org.chromium.ui.base.DeviceFormFactor;
|
| import org.chromium.ui.base.PageTransition;
|
| -import org.chromium.ui.base.WindowAndroid;
|
| +import org.chromium.ui.base.ViewRoot;
|
| import org.chromium.ui.widget.Toast;
|
|
|
| import java.lang.annotation.Retention;
|
| @@ -279,9 +279,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
| }
|
|
|
| private class TabbedModeTabCreator extends ChromeTabCreator {
|
| - public TabbedModeTabCreator(ChromeActivity activity, WindowAndroid nativeWindow,
|
| + public TabbedModeTabCreator(ChromeActivity activity, ViewRoot viewRoot,
|
| boolean incognito) {
|
| - super(activity, nativeWindow, incognito);
|
| + super(activity, viewRoot, incognito);
|
| }
|
|
|
| @Override
|
| @@ -1080,8 +1080,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
| @Override
|
| protected Pair<TabbedModeTabCreator, TabbedModeTabCreator> createTabCreators() {
|
| return Pair.create(
|
| - new TabbedModeTabCreator(this, getWindowAndroid(), false),
|
| - new TabbedModeTabCreator(this, getWindowAndroid(), true));
|
| + new TabbedModeTabCreator(this, getViewRoot(), false),
|
| + new TabbedModeTabCreator(this, getViewRoot(), true));
|
| }
|
|
|
| /**
|
|
|