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

chrome/browser/bookmarks/bookmark_context_menu.cc

Index: chrome/browser/bookmarks/bookmark_context_menu.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_context_menu.cc	(revision 10579)
+++ chrome/browser/bookmarks/bookmark_context_menu.cc	(working copy)
@@ -165,6 +165,11 @@
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          BookmarkNode* node) {}
 
+  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                             BookmarkNode* node) {
+    ModelChanged();
+  }
+
   void ModelChanged() {
     window_->Close();
   }
@@ -290,6 +295,13 @@
         IDS_PASTE, l10n_util::GetString(IDS_PASTE));
   }
 
+  if (configuration == BOOKMARK_MANAGER_ORGANIZE_MENU) {
+    menu_->AppendSeparator();
+    menu_->AppendMenuItemWithLabel(
+        IDS_BOOKMARK_MANAGER_SORT,
+        l10n_util::GetString(IDS_BOOKMARK_MANAGER_SORT));
+  }
+
   menu_->AppendSeparator();
 
   menu_->AppendMenuItemWithLabel(
@@ -437,6 +449,11 @@
       BookmarkManagerView::Show(profile_);
       break;
 
+    case IDS_BOOKMARK_MANAGER_SORT:
+      UserMetrics::RecordAction(L"BookmarkManager_Sort", profile_);
+      model_->SortChildren(parent_);
+      break;
+
     case IDS_COPY:
     case IDS_CUT:
       bookmark_utils::CopyToClipboard(profile_->GetBookmarkModel(),
@@ -494,6 +511,9 @@
               configuration_ == BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER) &&
              selection_.size() == 1;
 
+    case IDS_BOOKMARK_MANAGER_SORT:
+      return parent_ && parent_->GetParent();

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

If the GetParent() check is to protect against root node children, it might be
clearer to check (parent_ != model_->root_node()) like we do earlier in the
function.

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

Done.

+
     case IDS_BOOMARK_BAR_NEW_FOLDER:
     case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK:
       return GetParentForNewNodes() != NULL;
@@ -539,6 +559,11 @@
   ModelChanged();
 }
 
+void BookmarkContextMenu::BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                                        BookmarkNode* node) {
+  ModelChanged();
+}
+
 void BookmarkContextMenu::ModelChanged() {
   menu_->Cancel();
 }