Simplify the gtk AutoFill dialog and bring it more in line with the mocks....

chrome/common/gtk_util.cc

 // Copyright (c) 2009 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/common/gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <cstdarg>
+#include <map>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 195 matching lines @@
   if (height) {
     *height = static_cast<int>(
         (pango_font_metrics_get_ascent(metrics) +
         pango_font_metrics_get_descent(metrics)) *
         height_lines / PANGO_SCALE);
   }
   pango_font_metrics_unref(metrics);
   g_object_unref(context);
 }
 
-void SetWindowWidthFromResources(GtkWindow* window, int resource_id,
-                                 bool resizable) {
-  int width;
-  gtk_util::GetWidgetSizeFromResources(GTK_WIDGET(window), resource_id, 0,
-                                       &width, NULL);
+void SetWindowSizeFromResources(GtkWindow* window,
+                                int width_id, int height_id, bool resizable) {
+  int width = -1;
+  int height = -1;
+  gtk_util::GetWidgetSizeFromResources(GTK_WIDGET(window), width_id, height_id,
+                                       (width_id != -1) ? &width : NULL,
+                                       (height_id != -1) ? &height : NULL);
+
   if (resizable) {
-    gtk_window_set_default_size(window, width, -1);
+    gtk_window_set_default_size(window, width, height);
   } else {
-    gtk_widget_set_size_request(GTK_WIDGET(window), width, -1);
+    gtk_widget_set_size_request(GTK_WIDGET(window), width, height);
   }
   gtk_window_set_resizable(window, resizable ? TRUE : FALSE);
 }
 
 void RemoveAllChildren(GtkWidget* container) {
   gtk_container_foreach(GTK_CONTAINER(container), RemoveWidget, container);
 }
 
 void ForceFontSizePixels(GtkWidget* widget, double size_pixels) {
   GtkStyle* style = widget->style;
@@ skipping 463 matching lines @@
   g_signal_connect(container, "expose-event",
                    G_CALLBACK(PaintNoBackground), NULL);
 }
 
 void WrapLabelAtAllocationHack(GtkWidget* label) {
   g_signal_connect(label, "size-allocate",
                    G_CALLBACK(OnLabelAllocate), NULL);
 }
 
 }  // namespace gtk_util