DevTools: place DevTools WebContents underneath inspected WebContents.

chrome/browser/ui/gtk/browser_window_gtk.h

Index: chrome/browser/ui/gtk/browser_window_gtk.h
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 4e5dc6231ba0034f77ab8f2ca2ae3c17c6426828..271a802fe00b915cd0c9be29184d2dcbc1225d7f 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -21,6 +21,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
+#include "ui/base/gtk/gtk_floating_container.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/base/x/active_window_watcher_x_observer.h"
@@ -466,10 +467,6 @@ class BrowserWindowGtk
   // Hides docked devtools.
   void HideDevToolsContainer();
 
-  // Reads split position from the current tab's devtools window and applies
-  // it to the devtools split.
-  void UpdateDevToolsSplitPosition();
-
   // Called when the preference changes.
   void OnUseCustomChromeFrameChanged();
 
@@ -477,6 +474,12 @@ class BrowserWindowGtk
   // frame based on the currently-running window manager.
   static bool GetCustomFramePrefDefault();
 
+  // Handler for |devtools_floating_container_|'s "set-floating-position"
+  // signal.
+  static void OnDevToolsContainerSetFloatingPosition(
+      GtkFloatingContainer* container, GtkAllocation* allocation,
+      BrowserWindowGtk* browser_window);
+
   // The position and size of the current window.
   gfx::Rect bounds_;
 
@@ -523,19 +526,17 @@ class BrowserWindowGtk
   // into events and sent to the extension.
   scoped_ptr<ExtensionKeybindingRegistryGtk> extension_keybinding_registry_;
 
-  DevToolsDockSide devtools_dock_side_;
-
   // Docked devtools window instance. NULL when current tab is not inspected
   // or is inspected with undocked version of DevToolsWindow.
   DevToolsWindow* devtools_window_;
 
-  // Split pane containing the contents_container_ and the devtools_container_.
-  // Owned by contents_vsplit_.
-  GtkWidget* contents_hsplit_;
+  // Insets from the sides of devtools_floating_container_ to the sides of
+  // contents_container_. Non-zero only if docked devtools is visible.
+  gfx::Insets contents_insets_;
 
-  // Split pane containing the contents_hsplit_ and the devtools_container_.
+  // Floating container for devtools_container_ and contents_container_.
   // Owned by render_area_vbox_.
-  GtkWidget* contents_vsplit_;
+  GtkWidget* devtools_floating_container_;
 
   // The tab strip.  Always non-NULL.
   scoped_ptr<TabStripGtk> tabstrip_;