Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5065)

Unified Diff: chrome/browser/gtk/tab_contents_container_gtk.cc

Issue 149675: DevTools: Initial commit with docked devtools window support on Linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/tab_contents_container_gtk.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/tab_contents_container_gtk.cc
===================================================================
--- chrome/browser/gtk/tab_contents_container_gtk.cc (revision 20859)
+++ chrome/browser/gtk/tab_contents_container_gtk.cc (working copy)
@@ -58,19 +58,17 @@
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();
« no previous file with comments | « chrome/browser/gtk/tab_contents_container_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698