Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3029)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java

Issue 583373002: Break apart the TabModelBase's JNI calls into its own class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | chrome/browser/ui/android/tab_model/tab_model_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | chrome/browser/ui/android/tab_model/tab_model_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698