Chromium Code Reviews| Index: chrome/browser/gtk/browser_window_gtk.cc |
| =================================================================== |
| --- chrome/browser/gtk/browser_window_gtk.cc (revision 43662) |
| +++ chrome/browser/gtk/browser_window_gtk.cc (working copy) |
| @@ -1276,9 +1276,6 @@ |
| fullscreen_exit_bubble_.reset(); |
| UpdateCustomFrame(); |
| ShowSupportedWindowFeatures(); |
| - |
| - gtk_widget_show(toolbar_border_); |
| - gdk_window_lower(toolbar_border_->window); |
| } |
| } |
| @@ -1484,8 +1481,11 @@ |
| gtk_box_pack_start(GTK_BOX(render_area_vbox_), |
| toolbar_border_, FALSE, FALSE, 0); |
| gtk_widget_set_size_request(toolbar_border_, -1, 1); |
| - gtk_widget_show(toolbar_border_); |
| + gtk_widget_set_no_show_all(toolbar_border_, TRUE); |
| + if (IsToolbarSupported()) |
| + gtk_widget_show(toolbar_border_); |
| + |
| infobar_container_.reset(new InfoBarContainerGtk(browser_->profile())); |
| gtk_box_pack_start(GTK_BOX(render_area_vbox_), |
| infobar_container_->widget(), |
| @@ -1579,6 +1579,7 @@ |
| &frame_prelight_color_gdk); |
| GdkColor border_color = theme_provider->GetBorderColor(); |
| + |
|
Evan Martin
2010/04/06 01:35:39
intentional?
Evan Stade
2010/04/06 01:39:40
no
|
| gtk_widget_modify_bg(toolbar_border_, GTK_STATE_NORMAL, &border_color); |
| } |
| @@ -1930,8 +1931,11 @@ |
| if (IsTabStripSupported()) |
| tabstrip_->Show(); |
| - if (IsToolbarSupported()) |
| + if (IsToolbarSupported()) { |
| toolbar_->Show(); |
| + gtk_widget_show(toolbar_border_); |
| + gdk_window_lower(toolbar_border_->window); |
| + } |
| if (IsBookmarkBarSupported()) |
| MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), false); |