diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 09:35:55 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 09:35:55 +0000 |
| commit | c983d972c5cdb253352c6a835571788beb664352 (patch) | |
| tree | 2b48595596a5556b8f8ad7578c706c5cde49da18 /chrome/browser/gtk/tab_contents_container_gtk.cc | |
| parent | 5272e8d0df9a402ede0d3ef6a2f70a2d59852c7b (diff) | |
| download | chromium_src-c983d972c5cdb253352c6a835571788beb664352.zip chromium_src-c983d972c5cdb253352c6a835571788beb664352.tar.gz chromium_src-c983d972c5cdb253352c6a835571788beb664352.tar.bz2 | |
DevTools: Initial commit with docked devtools window support on Linux.
Review URL: http://codereview.chromium.org/149675
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/tab_contents_container_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/tab_contents_container_gtk.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/gtk/tab_contents_container_gtk.cc b/chrome/browser/gtk/tab_contents_container_gtk.cc index d55f9ca..5517f68 100644 --- a/chrome/browser/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/gtk/tab_contents_container_gtk.cc @@ -58,19 +58,17 @@ void TabContentsContainerGtk::Init() { G_CALLBACK(OnFixedSizeAllocate), this); gtk_container_add(GTK_CONTAINER(floating_.get()), fixed_); - gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(floating_.get()), - status_bubble_->widget()); - g_signal_connect(floating_.get(), "set-floating-position", - G_CALLBACK(OnSetFloatingPosition), this); + if (status_bubble_) { + gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(floating_.get()), + status_bubble_->widget()); + g_signal_connect(floating_.get(), "set-floating-position", + G_CALLBACK(OnSetFloatingPosition), this); + } gtk_widget_show(fixed_); gtk_widget_show(floating_.get()); } -void TabContentsContainerGtk::AddContainerToBox(GtkWidget* box) { - gtk_box_pack_start(GTK_BOX(box), floating_.get(), TRUE, TRUE, 0); -} - void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) { if (tab_contents_) { gfx::NativeView widget = tab_contents_->GetNativeView(); |