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

chrome/browser/gtk/bookmark_manager_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_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 415 matching lines @@
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), paned_, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(window_), vbox);
 
   ResetOrganizeMenu(true);
 }
 
 GtkWidget* BookmarkManagerGtk::MakeLeftPane() {
   left_store_ = bookmark_utils::MakeFolderTreeStore();
+  left_tree_view_ = bookmark_utils::MakeTreeViewForStore(left_store_);
 
-  GtkTreeViewColumn* icon_column = gtk_tree_view_column_new_with_attributes(
-      "", gtk_cell_renderer_pixbuf_new(), "pixbuf", bookmark_utils::FOLDER_ICON,
-       NULL);
-  GtkTreeViewColumn* name_column = gtk_tree_view_column_new_with_attributes(
-      "", gtk_cell_renderer_text_new(), "text", bookmark_utils::FOLDER_NAME,
-       NULL);
-
-  left_tree_view_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(left_store_));
-  // Let |tree_view| own the store.
-  g_object_unref(left_store_);
-  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(left_tree_view_), FALSE);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(left_tree_view_), icon_column);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(left_tree_view_), name_column);
   // When a row is collapsed that contained the selected node, we want to select
   // it.
   g_signal_connect(left_tree_view_, "row-collapsed",
                    G_CALLBACK(OnLeftTreeViewRowCollapsed), this);
   g_signal_connect(left_tree_view_, "focus-in-event",
                    G_CALLBACK(OnLeftTreeViewFocusIn), this);
   g_signal_connect(left_tree_view_, "button-press-event",
                    G_CALLBACK(OnTreeViewButtonPress), this);
   g_signal_connect(left_tree_view_, "button-release-event",
                    G_CALLBACK(OnTreeViewButtonRelease), this);
@@ skipping 945 matching lines @@
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), model_,
           path.ToWStringHack());
     }
   } else {
     NOTREACHED();
   }
 }