Linux bookmark manager first cut.

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 150 matching lines @@
                    G_CALLBACK(OnEntryChanged), this);
   gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE);
   gtk_table_attach_defaults(GTK_TABLE(table), GTK_WIDGET(url_entry_),
                             1, 2, 1, 2);
 
   gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
   if (show_tree_) {
     GtkTreeIter selected_iter;
     int selected_id = node_ ? node_->GetParent()->id() : 0;
-    bookmark_utils::BuildTreeStoreFrom(bb_model_, selected_id, &tree_store_,
-                                       &selected_iter);
+    tree_store_ = bookmark_utils::MakeFolderTreeStore();
+    bookmark_utils::AddToTreeStore(bb_model_, selected_id,
+                                   tree_store_, &selected_iter);
 
-    // TODO(erg): Figure out how to place icons here.
+    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(
-            "Folder", gtk_cell_renderer_text_new(), "text", 0, NULL);
+            "", 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_insert_column(GTK_TREE_VIEW(tree_view_), name_column, -1);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view_), icon_column);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view_), name_column);
     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
@@ skipping 131 matching lines @@
   }
 
   bookmark_utils::ApplyEditsWithPossibleGroupChange(
       bb_model_, new_parent, node_, new_title, new_url, handler_.get());
 }
 
 void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) {
   gtk_tree_store_append(tree_store_, child, parent);
   gtk_tree_store_set(
       tree_store_, child,
-      0, l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(),
-      1, 0,
+      bookmark_utils::FOLDER_ICON,
+      bookmark_utils::GetFolderIcon(),
+      bookmark_utils::FOLDER_NAME,
+      l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(),
+      bookmark_utils::ITEM_ID, 0,
       -1);
 }
 
 // static
 void BookmarkEditorGtk::OnResponse(GtkDialog* dialog, int response_id,
                                    BookmarkEditorGtk* window) {
   if (response_id == GTK_RESPONSE_ACCEPT) {
     window->ApplyEdits();
   }
 
@@ skipping 49 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);
 }