GTK: Make folder tree views expand columns properly, also refactor the code i...

chrome/browser/gtk/bookmark_editor_gtk.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/browser/gtk/bookmark_editor_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 139 matching lines @@
       NULL);
 
   gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
   if (show_tree_) {
     GtkTreeIter selected_iter;
     int64 selected_id = parent_ ? parent_->id() : 0;
     tree_store_ = bookmark_utils::MakeFolderTreeStore();
     bookmark_utils::AddToTreeStore(bb_model_, selected_id,
                                    tree_store_, &selected_iter);
-
-    GtkTreeViewColumn* icon_column =
-        gtk_tree_view_column_new_with_attributes(
-            "FolderIcon", gtk_cell_renderer_pixbuf_new(), "pixbuf",
-             bookmark_utils::FOLDER_ICON, NULL);
-    GtkTreeViewColumn* name_column =
-        gtk_tree_view_column_new_with_attributes(
-            "FolderName", gtk_cell_renderer_text_new(), "text",
-             bookmark_utils::FOLDER_NAME, NULL);
-
-    tree_view_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_store_));
-    // Let |tree_view| own the store.
-    g_object_unref(tree_store_);
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_view_), FALSE);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view_), icon_column);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view_), name_column);
+    tree_view_ = bookmark_utils::MakeTreeViewForStore(tree_store_);
     gtk_widget_set_size_request(tree_view_, kTreeWidth, kTreeHeight);
-
     tree_selection_ = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_));
 
     GtkTreePath* path = NULL;
     if (selected_id) {
       path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store_),
                                      &selected_iter);
     } else {
       // We don't have a selected parent (Probably because we're making a new
       // bookmark). Select the first item in the list.
       path = gtk_tree_path_new_from_string("0");
@@ skipping 204 matching lines @@
 
   GtkTreeIter new_item_iter;
   dialog->AddNewGroup(&iter, &new_item_iter);
 
   GtkTreePath* path = gtk_tree_model_get_path(
       GTK_TREE_MODEL(dialog->tree_store_), &new_item_iter);
   gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dialog->tree_view_), path);
   gtk_tree_selection_select_path(dialog->tree_selection_, path);
   gtk_tree_path_free(path);
 }