summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-06 23:33:08 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-06 23:33:08 +0000
commit3dda0dcf7d4856d598a2a0e7553e71dbd59134eb (patch)
treea9f2f93ce239ff603b05f900e34fa6a2a460227b /chrome/browser/gtk/browser_window_gtk.cc
parentae0f44dd31b81be0d9e0ef5d4478e0ef5ca2805d (diff)
downloadchromium_src-3dda0dcf7d4856d598a2a0e7553e71dbd59134eb.zip
chromium_src-3dda0dcf7d4856d598a2a0e7553e71dbd59134eb.tar.gz
chromium_src-3dda0dcf7d4856d598a2a0e7553e71dbd59134eb.tar.bz2
Basic infobars on linux.
All infobars consist of nothing but a non-functioning close button. Review URL: http://codereview.chromium.org/62070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 7613f69..b1f3f87 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/find_bar_controller.h"
#include "chrome/browser/gtk/bookmark_bar_gtk.h"
#include "chrome/browser/gtk/browser_toolbar_gtk.h"
+#include "chrome/browser/gtk/infobar_container_gtk.h"
#include "chrome/browser/gtk/find_bar_gtk.h"
#include "chrome/browser/gtk/status_bubble_gtk.h"
#include "chrome/browser/gtk/tab_contents_container_gtk.h"
@@ -198,6 +199,11 @@ BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
bookmark_bar_.reset(new BookmarkBarGtk(browser_->profile(), browser_.get()));
bookmark_bar_->AddBookmarkbarToBox(content_vbox_);
+ infobar_container_.reset(new InfoBarContainerGtk(this));
+ gtk_box_pack_start(GTK_BOX(content_vbox_),
+ infobar_container_->widget(),
+ FALSE, FALSE, 0);
+
// Insert a border between the toolbar and the web contents.
GtkWidget* border = gtk_event_box_new();
gtk_widget_set_size_request(border, -1, 1);
@@ -501,8 +507,7 @@ void BrowserWindowGtk::TabDetachedAt(TabContents* contents, int index) {
// the model has already removed |contents| from its list, so
// browser_->GetSelectedTabContents() will return NULL or something else.
if (index == browser_->tabstrip_model()->selected_index()) {
- // TODO(port): Uncoment this line when we get infobars.
- // infobar_container_->ChangeTabContents(NULL);
+ infobar_container_->ChangeTabContents(NULL);
contents_container_->SetTabContents(NULL);
// When dragging the last TabContents out of a window there is no selection
@@ -523,8 +528,7 @@ void BrowserWindowGtk::TabSelectedAt(TabContents* old_contents,
// Update various elements that are interested in knowing the current
// TabContents.
- // TOOD(port): Un-comment this line when we get infobars.
- // infobar_container_->ChangeTabContents(new_contents);
+ infobar_container_->ChangeTabContents(new_contents);
contents_container_->SetTabContents(new_contents);
new_contents->DidBecomeSelected();