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

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

 // Copyright (c) 2011 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/ui/gtk/bookmarks/bookmark_editor_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 296 matching lines @@
     url_entry_ = NULL;
     table = gtk_util::CreateLabeledControlsGroup(NULL,
         l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NAME_LABEL).c_str(),
         name_entry_,
         NULL);
   }
 
   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();
     else if (parent_)
       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_));
     g_signal_connect(tree_view_, "button-press-event",
                      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.
       path = gtk_tree_path_new_from_string("0");
     }
 
     gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tree_view_), path);
     gtk_tree_selection_select_path(tree_selection_, path);
     gtk_tree_path_free(path);
 
@@ skipping 229 matching lines @@
       GTK_TREE_MODEL(tree_store_), &new_item_iter);
   gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tree_view_), path);
 
   // Make the folder name editable.
   gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree_view_), path,
       gtk_tree_view_get_column(GTK_TREE_VIEW(tree_view_), 0),
       TRUE);
 
   gtk_tree_path_free(path);
 }