Fix TabControl#canCreateTab.
Preloaded tabs don't obey the tab limit (yet) so if a single preloaded
tab pushes the tab count up to mMaxTabs + 1, canCreateTab will always
return true from that point on.
This is just a partial fix, because Preloaded tabs still don't
obey this limit.
bug:5066968
Change-Id: I6bd574485a6e0f94324c9f6d0cb7624b8951e576
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 6473c88..7055ef3 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -155,7 +155,7 @@
}
boolean canCreateNewTab() {
- return mMaxTabs != mTabs.size();
+ return mMaxTabs > mTabs.size();
}
/**
@@ -186,11 +186,10 @@
* number of open tabs.
*/
Tab createNewTab(boolean privateBrowsing) {
- int size = mTabs.size();
- // Return false if we have maxed out on tabs
- if (mMaxTabs == size) {
+ if (!canCreateNewTab()) {
return null;
}
+
final WebView w = createNewWebView(privateBrowsing);
// Create a new tab and add it to the tab list