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

chrome/browser/gtk/bookmark_tree_model.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_tree_model.h"
 
 #include <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
@@ skipping 68 matching lines @@
 
 void AddToTreeStore(BookmarkModel* model, int64 selected_id,
                     GtkTreeStore* store, GtkTreeIter* selected_iter) {
   const BookmarkNode* root_node = model->root_node();
   for (int i = 0; i < root_node->GetChildCount(); ++i) {
     AddToTreeStoreAt(root_node->GetChild(i), selected_id, store,
                      selected_iter, NULL);
   }
 }
 
+GtkWidget* MakeTreeViewForStore(GtkTreeStore* store) {
+  GtkTreeViewColumn* column = gtk_tree_view_column_new();
+  GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new();
+  gtk_tree_view_column_pack_start(column, image_renderer, FALSE);
+  gtk_tree_view_column_add_attribute(column, image_renderer,
+                                     "pixbuf", FOLDER_ICON);
+  GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new();
+  g_object_set(text_renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
+  gtk_tree_view_column_add_attribute(column, text_renderer,
+                                     "text", FOLDER_NAME);
+
+  GtkWidget* tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+  // Let |tree_view| own the store.
+  g_object_unref(store);
+  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_view), FALSE);
+  gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+  return tree_view;
+}
+
 void AddToTreeStoreAt(const BookmarkNode* node, int64 selected_id,
                       GtkTreeStore* store, GtkTreeIter* selected_iter,
                       GtkTreeIter* parent) {
   if (!node->is_folder())
     return;
 
   GtkTreeIter iter;
   AddSingleNodeToTreeStore(store, node, &iter, parent);
   if (selected_iter && node->id() == selected_id) {
      // Save the iterator. Since we're using a GtkTreeStore, we're
@@ skipping 70 matching lines @@
     ret_val = UTF8ToWide(utf8str);
     g_value_unset(&value);
   } else {
     NOTREACHED() << "Impossible type mismatch";
   }
 
   return ret_val;
 }
 
 }  // namespace bookmark_utils