| Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
|
| index bab35e7c9f3b876c7d8e263ed3ce360863e63b62..2366ee40a7c2c8b0cff747516e708b34be577510 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
|
| @@ -24,7 +24,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;
|
|
|
| /**
|
| * This class creates various kinds of new tabs and adds them to the right {@link TabModel}.
|
| @@ -32,7 +32,7 @@ import org.chromium.ui.base.WindowAndroid;
|
| public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
|
|
| private final ChromeActivity mActivity;
|
| - private final WindowAndroid mNativeWindow;
|
| + private final ViewRoot mViewRoot;
|
| private final boolean mIncognito;
|
|
|
| private TabModel mTabModel;
|
| @@ -40,9 +40,9 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
| private TabModelOrderController mOrderController;
|
|
|
| public ChromeTabCreator(
|
| - ChromeActivity activity, WindowAndroid nativeWindow, boolean incognito) {
|
| + ChromeActivity activity, ViewRoot viewRoot, boolean incognito) {
|
| mActivity = activity;
|
| - mNativeWindow = nativeWindow;
|
| + mViewRoot = viewRoot;
|
| mIncognito = incognito;
|
| }
|
|
|
| @@ -131,7 +131,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
| assert TabModelUtils.getTabIndexById(mTabModel, assignedTabId)
|
| == TabModel.INVALID_TAB_INDEX;
|
| tab = Tab.createLiveTab(assignedTabId, mActivity, mIncognito,
|
| - mNativeWindow, type, parentId, !openInForeground);
|
| + mViewRoot, type, parentId, !openInForeground);
|
| tab.initialize(
|
| webContents, mTabContentManager, delegateFactory, !openInForeground, false);
|
| tab.setParentIntent(parentIntent);
|
| @@ -140,12 +140,12 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
| // On low memory devices the tabs opened in background are not loaded automatically
|
| // to preserve resources (cpu, memory, strong renderer binding) for the foreground
|
| // tab.
|
| - tab = Tab.createTabForLazyLoad(mActivity, mIncognito, mNativeWindow, type,
|
| + tab = Tab.createTabForLazyLoad(mActivity, mIncognito, mViewRoot, type,
|
| parentId, loadUrlParams);
|
| tab.initialize(null, mTabContentManager, delegateFactory, !openInForeground, false);
|
| } else {
|
| tab = Tab.createLiveTab(Tab.INVALID_TAB_ID, mActivity, mIncognito,
|
| - mNativeWindow, type, parentId, !openInForeground);
|
| + mViewRoot, type, parentId, !openInForeground);
|
| tab.initialize(null, mTabContentManager, delegateFactory, !openInForeground, false);
|
| tab.loadUrl(loadUrlParams);
|
| }
|
| @@ -179,7 +179,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
| TabDelegateFactory delegateFactory = parent == null ? createDefaultTabDelegateFactory()
|
| : parent.getDelegateFactory();
|
| Tab tab = Tab.createLiveTab(Tab.INVALID_TAB_ID, mActivity, mIncognito,
|
| - mNativeWindow, type, parentId, !openInForeground);
|
| + mViewRoot, type, parentId, !openInForeground);
|
| tab.initialize(webContents, mTabContentManager, delegateFactory, !openInForeground, false);
|
| mTabModel.addTab(tab, position, type);
|
| return true;
|
| @@ -277,7 +277,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
| @Override
|
| public Tab createFrozenTab(TabState state, int id, int index) {
|
| Tab tab = Tab.createFrozenTabFromState(
|
| - id, mActivity, state.isIncognito(), mNativeWindow, state.parentId, state);
|
| + id, mActivity, state.isIncognito(), mViewRoot, state.parentId, state);
|
| boolean selectTab = mOrderController.willOpenInForeground(TabLaunchType.FROM_RESTORE,
|
| state.isIncognito());
|
| tab.initialize(
|
|
|