diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 19:12:05 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 19:12:05 +0000 |
| commit | 0411509f65aae2b1ba684bf87343a14253246de0 (patch) | |
| tree | 118c9bd90f24f14f4524a976c5eae8dbd9a35ace /chrome/browser | |
| parent | daec85b78d9354c6f24186e367e5b34219f50cc4 (diff) | |
| download | chromium_src-0411509f65aae2b1ba684bf87343a14253246de0.zip chromium_src-0411509f65aae2b1ba684bf87343a14253246de0.tar.gz chromium_src-0411509f65aae2b1ba684bf87343a14253246de0.tar.bz2 | |
Fixes crash in Browser::AddTabWithURL. The crash would happen if
GetOrCreateTabbedBrowser returned this.
BUG=42914
TEST=see bug
Review URL: http://codereview.chromium.org/1812009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index a8fccd7..32a15ca 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -765,7 +765,8 @@ TabContents* Browser::AddTabWithURL(const GURL& url, SiteInstance* instance, const std::string& app_extension_id) { TabContents* contents = NULL; - if (SupportsWindowFeature(FEATURE_TABSTRIP) || tabstrip_model()->empty()) { + if (SupportsWindowFeature(FEATURE_TABSTRIP) || tabstrip_model()->empty() || + BrowserList::FindBrowserWithType(profile_, TYPE_NORMAL, false) == this) { GURL url_to_load = url; if (url_to_load.is_empty()) url_to_load = GetHomePage(); |