| Index: chrome/common/gtk_util.cc
|
| diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
|
| index dfb0ac88818f3bd407a833077b9a1c12d8fa8372..19eb595b6e1e32efe153946257776a0e6e026694 100644
|
| --- a/chrome/common/gtk_util.cc
|
| +++ b/chrome/common/gtk_util.cc
|
| @@ -140,8 +140,8 @@ guint32 GetGdkEventTime(GdkEvent* event) {
|
|
|
| namespace gtk_util {
|
|
|
| -GtkWidget* CreateLabeledControlsGroup(const GdkColor* text_color,
|
| - const char* text, ...) {
|
| +GtkWidget* CreateLabeledControlsGroup(std::vector<GtkWidget*>* labels,
|
| + const char* text, ...) {
|
| va_list ap;
|
| va_start(ap, text);
|
| GtkWidget* table = gtk_table_new(0, 2, FALSE);
|
| @@ -153,8 +153,8 @@ GtkWidget* CreateLabeledControlsGroup(const GdkColor* text_color,
|
| GtkWidget* control = va_arg(ap, GtkWidget*);
|
| GtkWidget* label = gtk_label_new(text);
|
| gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
| - if (text_color)
|
| - gtk_widget_modify_fg(label, GTK_STATE_NORMAL, text_color);
|
| + if (labels)
|
| + labels->push_back(label);
|
|
|
| gtk_table_attach(GTK_TABLE(table), label,
|
| 0, 1, row, row + 1,
|
|
|