Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java |
| index 9a144443c3aeefc1974a1fef69d5bb4acb3d5972..cc72cc87b63127b9570204a3360750e5943f6964 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java |
| @@ -35,7 +35,7 @@ public abstract class TabModelBase implements TabModel { |
| protected final TabModelDelegate mModelDelegate; |
| - private final ObserverList<TabModelObserver> mObservers; |
| + protected final ObserverList<TabModelObserver> mObservers; |
|
David Trainor- moved to gerrit
2014/09/19 22:20:33
javadoc. Same for all other protected/public stuf
|
| // Undo State Tracking ------------------------------------------------------------------------- |
| @@ -53,17 +53,28 @@ public abstract class TabModelBase implements TabModel { |
| private int mIndex = INVALID_TAB_INDEX; |
| /** Native Tab pointer which will be set by nativeInit(). */ |
| - private long mNativeTabModelImpl = 0; |
| + protected long mNativeTabModelImpl = 0; |
| + |
| + protected TabModelBase(boolean incognito) { |
| + mIsIncognito = incognito; |
| + mOrderController = null; |
| + mModelDelegate = null; |
| + mObservers = new ObserverList<TabModelObserver>(); |
| + } |
| public TabModelBase(boolean incognito, TabModelOrderController orderController, |
| TabModelDelegate modelDelegate) { |
| mIsIncognito = incognito; |
| - mNativeTabModelImpl = nativeInit(incognito); |
| + initializeNativeTabModel(); |
| mOrderController = orderController; |
|
David Trainor- moved to gerrit
2014/09/19 22:20:33
Should we be null checking mOrderController/mModel
gone
2014/10/01 20:15:46
I'm hoping to add versions of these for document m
|
| mModelDelegate = modelDelegate; |
| mObservers = new ObserverList<TabModelObserver>(); |
| } |
| + protected void initializeNativeTabModel() { |
| + mNativeTabModelImpl = nativeInit(mIsIncognito); |
|
David Trainor- moved to gerrit
2014/09/19 22:20:33
Does this work? Don't you hit reinterpret_cast<>
gone
2014/10/01 20:15:46
Oddly, no. Seems to be fine. Subclass methods ar
|
| + } |
| + |
| @Override |
| public Profile getProfile() { |
| return nativeGetProfileAndroid(mNativeTabModelImpl); |
| @@ -631,7 +642,7 @@ public abstract class TabModelBase implements TabModel { |
| protected abstract Tab createNewTabForDevTools(String url); |
| @CalledByNative |
| - private boolean isSessionRestoreInProgress() { |
| + protected boolean isSessionRestoreInProgress() { |
| return mModelDelegate.isSessionRestoreInProgress(); |
| } |