diff options
| author | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 19:12:11 +0000 |
|---|---|---|
| committer | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 19:12:11 +0000 |
| commit | 9522ddf3c862eb128b815af9ef205ab9fadb703e (patch) | |
| tree | 220d1f2915947c9453cd650ed4631497c0a170d9 | |
| parent | 57b9396ce02f494dee0eb42a7eafde525aea1028 (diff) | |
| download | chromium_src-9522ddf3c862eb128b815af9ef205ab9fadb703e.zip chromium_src-9522ddf3c862eb128b815af9ef205ab9fadb703e.tar.gz chromium_src-9522ddf3c862eb128b815af9ef205ab9fadb703e.tar.bz2 | |
fix touchui max tab count and navigation problem when max tab count is hit.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8177016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104539 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/defaults.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index 4829c43..9c68593 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -78,7 +78,7 @@ const bool kBrowserAliveWithNoWindows = false; const int kBookmarkBarHeight = 50; const int kNewtabBookmarkBarHeight = 72; // TouchUI issue with opening too many tabs. -const int kMaxTabCount = 8; +const int kMaxTabCount = 4; #else const int kBookmarkBarHeight = 28; const int kNewtabBookmarkBarHeight = 57; diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index dbf091e..b7f5863 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -378,9 +378,17 @@ void Navigate(NavigateParams* params) { } params->browser = GetBrowserForDisposition(params); - if (!params->browser || - params->browser->tab_count() >= browser_defaults::kMaxTabCount) + + if (!params->browser) return; + + if (params->browser->tab_count() >= browser_defaults::kMaxTabCount && + (params->disposition == NEW_POPUP || + params->disposition == NEW_FOREGROUND_TAB || + params->disposition == NEW_BACKGROUND_TAB)) { + return; + } + // Navigate() must not return early after this point. if (GetSourceProfile(params, source_browser) != params->browser->profile()) { |