Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc

Index: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
index 2d39eac10b9a7f78a2e2d4710ff03c1cb1eea78c..ee996b65821f114e0b778ca93c6bbf9cd6f56599 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -314,7 +314,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
   gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
   if (show_tree_) {
-    GtkTreeIter selected_iter;
+    GtkTreeIter* selected_iter = NULL;

[Elliot Glaysher, 2011/05/18 21:39:29]

I am pretty sure the memory handling here is incorrect. selected_iter is storage
space to write into and is usually stack allocated (see gtk docs). I don't see
it being allocated anywhere in the bookmark_tree_model.cc

[Yaron, 2011/05/18 23:29:01]

Done.

     int64 selected_id = 0;
     if (details_.type == EditDetails::EXISTING_NODE)
       selected_id = details_.existing_node->parent()->id();
@@ -322,7 +322,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
       selected_id = parent_->id();
     tree_store_ = bookmark_utils::MakeFolderTreeStore();
     bookmark_utils::AddToTreeStore(bb_model_, selected_id, tree_store_,
-                                   &selected_iter);
+                                   selected_iter);
     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_));
@@ -330,9 +330,9 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
                      G_CALLBACK(OnTreeViewButtonPressEventThunk), this);
 
     GtkTreePath* path = NULL;
-    if (selected_id) {
+    if (selected_id && selected_iter != NULL) {
       path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store_),
-                                     &selected_iter);
+                                     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.