diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 01:40:20 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 01:40:20 +0000 |
| commit | 62d8e296a1c65219e2f6f4bd95ded9947db6ec6c (patch) | |
| tree | 007014ab06e5d8b02fef6d54824bf0a6e1e173cf | |
| parent | d4da3c5996842171e70a909b63129f7f4c5cf819 (diff) | |
| download | chromium_src-62d8e296a1c65219e2f6f4bd95ded9947db6ec6c.zip chromium_src-62d8e296a1c65219e2f6f4bd95ded9947db6ec6c.tar.gz chromium_src-62d8e296a1c65219e2f6f4bd95ded9947db6ec6c.tar.bz2 | |
GTK: Don't show toolbar border without the toolbar.
BUG=39172
TEST=visual
Review URL: http://codereview.chromium.org/1549021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43685 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 682a302..30f5217 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -1276,9 +1276,6 @@ void BrowserWindowGtk::OnStateChanged(GdkWindowState state, fullscreen_exit_bubble_.reset(); UpdateCustomFrame(); ShowSupportedWindowFeatures(); - - gtk_widget_show(toolbar_border_); - gdk_window_lower(toolbar_border_->window); } } @@ -1484,7 +1481,10 @@ void BrowserWindowGtk::InitWidgets() { 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_), @@ -1930,8 +1930,11 @@ void BrowserWindowGtk::ShowSupportedWindowFeatures() { 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); |