| Index: chrome/browser/gtk/browser_window_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/gtk/browser_window_gtk.cc (revision 20001)
|
| +++ chrome/browser/gtk/browser_window_gtk.cc (working copy)
|
| @@ -1021,15 +1021,8 @@
|
|
|
| toolbar_.reset(new BrowserToolbarGtk(browser_.get(), this));
|
| toolbar_->Init(browser_->profile(), window_);
|
| - bool hide_tools = false;
|
| -#if defined(LINUX2)
|
| - if (browser_->type() == Browser::TYPE_POPUP)
|
| - hide_tools = true;
|
| -#endif
|
| + toolbar_->AddToolbarToBox(content_vbox_);
|
|
|
| - if (!hide_tools)
|
| - toolbar_->AddToolbarToBox(content_vbox_);
|
| -
|
| bookmark_bar_.reset(new BookmarkBarGtk(browser_->profile(), browser_.get(),
|
| this));
|
| bookmark_bar_->AddBookmarkbarToBox(content_vbox_);
|
| @@ -1053,6 +1046,7 @@
|
|
|
| #if defined(LINUX2)
|
| if (browser_->type() == Browser::TYPE_POPUP) {
|
| + toolbar_->Hide();
|
| // The window manager needs the min size for popups
|
| gtk_widget_set_size_request(
|
| GTK_WIDGET(window_), bounds_.width(), bounds_.height());
|
|
|