diff options
| author | Narayan Kamath <narayan@google.com> | 2011-07-26 15:20:21 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2011-07-26 15:55:55 +0100 |
| commit | c3ad9eada3ab7acac5d194fd4a8d30443079e80e (patch) | |
| tree | 7d2cca5047f446e99013feb1eb22283ad1e5c7f0 /src/com/android/browser/TabControl.java | |
| parent | a229f22f88a0ae7a5e6601744c1b37795117bb4f (diff) | |
| download | packages_apps_Browser-c3ad9eada3ab7acac5d194fd4a8d30443079e80e.tar.gz packages_apps_Browser-c3ad9eada3ab7acac5d194fd4a8d30443079e80e.tar.bz2 packages_apps_Browser-c3ad9eada3ab7acac5d194fd4a8d30443079e80e.zip | |
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
Diffstat (limited to 'src/com/android/browser/TabControl.java')
| -rw-r--r-- | src/com/android/browser/TabControl.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java index 6473c8867..7055ef3bb 100644 --- a/src/com/android/browser/TabControl.java +++ b/src/com/android/browser/TabControl.java @@ -155,7 +155,7 @@ class TabControl { } boolean canCreateNewTab() { - return mMaxTabs != mTabs.size(); + return mMaxTabs > mTabs.size(); } /** @@ -186,11 +186,10 @@ class TabControl { * 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 |
