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

chrome/common/gtk_util.h

 // 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.
 
 #ifndef CHROME_COMMON_GTK_UTIL_H_
 #define CHROME_COMMON_GTK_UTIL_H_
 
 #include <gtk/gtk.h>
 #include <string>
 #include <vector>
@@ skipping 64 matching lines @@
 // NOTE: Make sure to realize |widget| before using this method, or a
 // default font size will be used instead of the actual font size.
 void GetWidgetSizeFromResources(GtkWidget* widget, int width_chars,
                                 int height_lines, int* width, int* height);
 
 // As above, but uses number of characters/lines directly rather than looking
 // up a resource.
 void GetWidgetSizeFromCharacters(GtkWidget* widget, double width_chars,
                                  double height_lines, int* width, int* height);
 
-// As above, but a convenience method for configuring dialog width.
+// As above, but a convenience method for configuring dialog size.
+// |width_id| and |height_id| are resource IDs for the size.  If either of these
+// are set to -1, the respective size will be set to the widget default.
 // |resizable| also controls whether the dialog will be resizable
 // (this info is also necessary for getting the width-setting code
 // right).
-void SetWindowWidthFromResources(GtkWindow* window, int resource_id,
-                                 bool resizable);
+void SetWindowSizeFromResources(GtkWindow* window,
+                                int width_id, int height_id, bool resizable);
 
 // Remove all children from this container.
 void RemoveAllChildren(GtkWidget* container);
 
 // Force the font size of the widget to |size_pixels| and the font to "Sans" if
 // we can't get |size_pixels| with the current font. We have to do this because
 // GTK gets seriously confused as GTK's text layout system doesn't like our
 // constant gtk_widget_set_size_requests() calls.
 //
 // This function should not be used for new code.
@@ skipping 137 matching lines @@
 // at the default width.
 // This is called a hack because the gtk docs state that it is logically
 // inconsistent for a widget to make its size request depend on its allocation.
 // It does, however, have the intended effect of wrapping the label at the
 // proper width.
 void WrapLabelAtAllocationHack(GtkWidget* label);
 
 }  // namespace gtk_util
 
 #endif  // CHROME_COMMON_GTK_UTIL_H_