summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-08 16:16:08 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-08 16:16:08 +0000
commit5b2e8faf4be9281ed3775a2d9e1462a56880a678 (patch)
tree63b61cf25486de2f20047c9a85be9a2ae85b3635 /chrome
parentb388e97b2bf766a31545bbcd193c3ab21aff0069 (diff)
downloadchromium_src-5b2e8faf4be9281ed3775a2d9e1462a56880a678.zip
chromium_src-5b2e8faf4be9281ed3775a2d9e1462a56880a678.tar.gz
chromium_src-5b2e8faf4be9281ed3775a2d9e1462a56880a678.tar.bz2
Wasn't able to browse to new files within panels
Review URL: http://codereview.chromium.org/149303 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index fc65627..3d57433 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1031,14 +1031,7 @@ void BrowserWindowGtk::InitWidgets() {
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
-
- if (!hide_tools)
- toolbar_->AddToolbarToBox(content_vbox_);
+ toolbar_->AddToolbarToBox(content_vbox_);
bookmark_bar_.reset(new BookmarkBarGtk(browser_->profile(), browser_.get(),
this));
@@ -1063,6 +1056,7 @@ void BrowserWindowGtk::InitWidgets() {
#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());