diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 18:25:45 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-14 18:25:45 +0000 |
| commit | c6b68a05568234a457acfe5199fcc130c02f969c (patch) | |
| tree | 6e28678664288f73ad23d3c07a1062b73bb8f81a /chrome | |
| parent | 91f0084f7fdead9cbeda53ecfad2376d36e3740f (diff) | |
| download | chromium_src-c6b68a05568234a457acfe5199fcc130c02f969c.zip chromium_src-c6b68a05568234a457acfe5199fcc130c02f969c.tar.gz chromium_src-c6b68a05568234a457acfe5199fcc130c02f969c.tar.bz2 | |
Fix a crash when the browser opens a popup window in Linux.
Review URL: http://codereview.chromium.org/73045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 45f1839..65abf1f 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -1089,6 +1089,11 @@ gboolean TabStripGtk::OnConfigure(GtkWidget* widget, GdkEventConfigure* event, gfx::Rect bounds = gfx::Rect(event->x, event->y, event->width, event->height); tabstrip->SetBounds(bounds); + // No tabs, nothing to layout. This happens when a browser window is created + // and shown before tabs are added (as in a popup window). + if (tabstrip->GetTabCount() == 0) + return TRUE; + // Do a regular layout on the first configure-event so we don't animate // the first tab. // TODO(jhawkins): Windows resizes the layout tabs continuously during |