Knock out a couple more TODOs from the bookmark manager....

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 <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 114 matching lines @@
     manager->SelectInTree(node, false);
 }
 
 void BookmarkManager::Show(Profile* profile) {
   BookmarkManagerGtk::Show(profile);
 }
 
 // BookmarkManagerGtk, public --------------------------------------------------
 
 void BookmarkManagerGtk::SelectInTree(const BookmarkNode* node, bool expand) {
+  if (expand)
+    DCHECK(node->is_folder());
+
+  // Expand the left tree view to |node| if |node| is a folder, or to the parent
+  // folder of |node| if it is a URL.
   GtkTreeIter iter = { 0, };
-  if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, node->id())) {
+  int id = node->is_folder() ? node->id() : node->GetParent()->id();
+  if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, id)) {
     GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(left_store_),
                         &iter);
     gtk_tree_view_expand_to_path(GTK_TREE_VIEW(left_tree_view_), path);
     gtk_tree_selection_select_path(left_selection(), path);
     if (expand)
       gtk_tree_view_expand_row(GTK_TREE_VIEW(left_tree_view_), path, true);
 
     gtk_tree_path_free(path);
   }
-  // TODO(estade): select in the right side table view?
+
+  if (node->is_url()) {
+    GtkTreeIter iter;
+    bool found = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(right_store_),
+                                               &iter);
+    while (found) {
+      if (node->id() == GetRowIDAt(GTK_TREE_MODEL(right_store_), &iter)) {
+        gtk_tree_selection_select_iter(right_selection(), &iter);
+        break;
+      }
+
+      found = gtk_tree_model_iter_next(GTK_TREE_MODEL(right_store_), &iter);
+    }
+
+    DCHECK(found);
+  }
 }
 
 // static
 void BookmarkManagerGtk::Show(Profile* profile) {
   if (!profile->GetBookmarkModel())
     return;
   if (!manager)
     manager = new BookmarkManagerGtk(profile);
   else
     gtk_window_present(GTK_WINDOW(manager->window_));
 }
 
 void BookmarkManagerGtk::BookmarkManagerGtk::Loaded(BookmarkModel* model) {
   BuildLeftStore();
   BuildRightStore();
   g_signal_connect(left_selection(), "changed",
                    G_CALLBACK(OnLeftSelectionChanged), this);
+  ResetOrganizeMenu(false);
 }
 
 void BookmarkManagerGtk::BookmarkModelBeingDeleted(BookmarkModel* model) {
   gtk_widget_destroy(window_);
 }
 
 void BookmarkManagerGtk::BookmarkNodeMoved(BookmarkModel* model,
                                            const BookmarkNode* old_parent,
                                            int old_index,
                                            const BookmarkNode* new_parent,
@@ skipping 35 matching lines @@
         gtk_tree_selection_select_iter(left_selection(), &parent);
       }
 
       gtk_tree_store_remove(left_store_, &iter);
     }
   }
 }
 
 void BookmarkManagerGtk::BookmarkNodeChanged(BookmarkModel* model,
                                              const BookmarkNode* node) {
-  // TODO(estade): rename in the left tree view.
+  if (node->is_folder()) {
+    GtkTreeIter iter = { 0, };
+    if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, node->id())) {
+      gtk_tree_store_set(left_store_, &iter,
+                         bookmark_utils::FOLDER_NAME,
+                         WideToUTF8(node->GetTitle()).c_str(),
+                         bookmark_utils::ITEM_ID, node->id(),
+                         -1);
+    }
+  }
 }
 
 void BookmarkManagerGtk::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
   // TODO(estade): reorder in the left tree view.
 }
 
 void BookmarkManagerGtk::BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                                    const BookmarkNode* node) {
   // I don't think we have anything to do, as we should never get this for a
@@ skipping 943 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();
   }
 }