[DevTools] Use special resizing strategy instead of insets.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 2262 matching lines @@
   }
 
   // Show / hide container if necessary.
   bool should_hide = devtools_window_ && !new_devtools_window;
   bool should_show = new_devtools_window && !devtools_window_;
 
   if (should_hide)
     HideDevToolsContainer();
 
   devtools_window_ = new_devtools_window;
-  contents_insets_ = devtools_window_ ? devtools_window_->GetContentsInsets() :
-      gfx::Insets();
+  contents_resizing_strategy_ = devtools_window_ ?
+      devtools_window_->GetContentsResizingStrategy() :
+      DevToolsContentsResizingStrategy();
 
   if (should_show)
     ShowDevToolsContainer();
 
   gtk_widget_queue_resize(devtools_floating_container_);
   gtk_widget_queue_draw(devtools_floating_container_);
 }
 
 void BrowserWindowGtk::ShowDevToolsContainer() {
   // Move devtools below contents.
   GdkWindow* const devtools_gdk_window =
       gtk_widget_get_window(devtools_container_->widget());
   if (devtools_gdk_window)
     gdk_window_lower(devtools_gdk_window);
 }
 
 void BrowserWindowGtk::HideDevToolsContainer() {
   // This method is left intentionally blank.
 }
 
 // static
 void BrowserWindowGtk::OnDevToolsContainerSetFloatingPosition(
     GtkFloatingContainer* container, GtkAllocation* allocation,
     BrowserWindowGtk* browser_window) {
-  gfx::Insets insets = browser_window->contents_insets_;
+  GtkAllocation contents_allocation;
+  gtk_widget_get_allocation(browser_window->contents_container_->widget(),
+      &contents_allocation);
 
-  int contents_width = std::max(0, allocation->width - insets.width());
-  int contents_height = std::max(0, allocation->height - insets.height());
-  int contents_x = std::min(insets.left(), allocation->width);
-  int contents_y = std::min(insets.top(), allocation->height);
+  gfx::Size container_size(allocation->width, allocation->height);
+  gfx::Rect old_devtools_bounds(0, 0, allocation->width, allocation->height);
+  gfx::Rect old_contents_bounds(contents_allocation.x, contents_allocation.y,
+      contents_allocation.width, contents_allocation.height);
+  gfx::Rect new_devtools_bounds;
+  gfx::Rect new_contents_bounds;
+
+  browser_window->contents_resizing_strategy_.Apply(container_size,
+      old_devtools_bounds, old_contents_bounds,
+      &new_devtools_bounds, &new_contents_bounds);
 
   gtk_widget_set_size_request(browser_window->contents_container_->widget(),
-      contents_width, contents_height);
+      new_contents_bounds.width(), new_contents_bounds.height());
 
   GValue value = { 0, };
   g_value_init(&value, G_TYPE_INT);
-  g_value_set_int(&value, contents_x);
+  g_value_set_int(&value, new_contents_bounds.x());
   gtk_container_child_set_property(GTK_CONTAINER(container),
       browser_window->contents_container_->widget(), "x", &value);
-  g_value_set_int(&value, contents_y);
+  g_value_set_int(&value, new_contents_bounds.y());
   gtk_container_child_set_property(GTK_CONTAINER(container),
       browser_window->contents_container_->widget(), "y", &value);
   g_value_unset(&value);
 }
 
 void BrowserWindowGtk::OnUseCustomChromeFrameChanged() {
   UpdateCustomFrame();
   ui::SetHideTitlebarWhenMaximizedProperty(
       ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window_)),
       UseCustomFrame() ? ui::HIDE_TITLEBAR_WHEN_MAXIMIZED :
@@ skipping 26 matching lines @@
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }
 
 // static
 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(
     chrome::HostDesktopType desktop_type) {
   return desktop_type;
 }