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..84792d45194785bf26a6d5dfdb959ab76f61515b 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -330,7 +330,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
                      G_CALLBACK(OnTreeViewButtonPressEventThunk), this);
 
     GtkTreePath* path = NULL;
-    if (selected_id) {
+    if (selected_id && selected_iter.user_data != NULL) {

[Elliot Glaysher, 2011/05/18 23:51:42]

I don't understand this modified line. I don't see where user_data gets set or
why you can rely on this.

[Yaron, 2011/05/19 00:05:14]

It gets set within bookmark_utils::AddToTreeStore which calls
bookmark_utils::AddToTreeStoreAt which copies iter to  selected_iter.
(http://google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/chrome/browser/ui/gtk/bo...)


iter's user_data field gets set in AddSingleNodeToTreeStore, presumably in one
of the gtk calls:
http://google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/chrome/browser/ui/gtk/bo...

The way I discovered this was that before we wouldn't show Synced Bookmarks even
if it had children. So if the current page was bookmarked, I hit the star, and
clicked edit, it would crash on a check for user_data being non-null. Since this
was technically fixed another way (we no longer hide nodes if they have
children), this isn't strictly necessary but I thought it was safer to include
it. I can remove it if you think that's better.

       path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store_),
                                      &selected_iter);
     } else {