Wires up sorting of bookmarks to the 'organize menu' in the bookmark...

chrome/browser/bookmarks/bookmark_folder_tree_model.cc

 // Copyright (c) 2006-2008 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/bookmarks/bookmark_folder_tree_model.h"
 
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 112 matching lines @@
 
   FolderNode* folder_node = GetFolderNodeForBookmarkNode(node);
   if (!folder_node)
     return;
 
   folder_node->SetTitle(node->GetTitle());
   if (GetObserver())
     GetObserver()->TreeNodeChanged(this, folder_node);
 }
 
+void BookmarkFolderTreeModel::BookmarkNodeChildrenReordered(
+    BookmarkModel* model,
+    BookmarkNode* node) {
+  FolderNode* folder_node = GetFolderNodeForBookmarkNode(node);
+  DCHECK(folder_node);
+  if (folder_node->GetChildCount() <= 1)
+    return;  // Order won't have changed if 1 or fewer nodes.
+
+  // Build a map between folder node and bookmark node.
+  std::map<BookmarkNode*, FolderNode*> bn_to_folder;
+  for (int i = 0; i < folder_node->GetChildCount(); ++i)
+    bn_to_folder[folder_node->GetChild(i)->value] = folder_node->GetChild(i);

[ncarter (slow), 2009/02/27 21:22:34]

If this map always existed (for all FolderNodes), what would be the downside? 
It could be used to trivially implement GetFolderNodeForBookmarkNode.

That being said, I am also OK with the way things are here.

[sky, 2009/02/27 21:42:06]

That's a good idea. I'm going to hold off at this time though so that we don't
have to go another round.

+
+  // Remove all the folder nodes.
+  int original_count = folder_node->GetChildCount();
+  folder_node->RemoveAll();
+
+  // And add them back in the new order.
+  for (int i = 0; i < node->GetChildCount(); ++i) {
+    BookmarkNode* child = node->GetChild(i);
+    if (child->is_folder()) {
+      DCHECK(bn_to_folder.find(child) != bn_to_folder.end());
+      folder_node->Add(folder_node->GetChildCount(), bn_to_folder[child]);
+    }
+  }
+  // The new count better match the original count, otherwise we're leaking and
+  // treeview is likely to get way out of sync.
+  DCHECK(original_count == folder_node->GetChildCount());
+
+  // Finally, notify observers.
+  if (GetObserver())
+    GetObserver()->TreeNodeChildrenReordered(this, folder_node);
+}
+
 void BookmarkFolderTreeModel::GetIcons(std::vector<SkBitmap>* icons) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON));
   icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_SEARCH_ICON));
 }
 
 int BookmarkFolderTreeModel::GetIconIndex(views::TreeModelNode* node) {
   if (node == recently_bookmarked_node_)
     return 0;
   if (node == search_node_)
@@ skipping 45 matching lines @@
   for (int i = 0, folder_count = 0; i < parent->GetChildCount(); ++i) {
     BookmarkNode* child = parent->GetChild(i);
     if (child == node)
       return folder_count;
     if (child->is_folder())
       folder_count++;
   }
   NOTREACHED();
   return 0;
 }