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

chrome/browser/bookmarks/bookmark_context_menu.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_context_menu.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 147 matching lines @@
     ModelChanged();
   }
 
   virtual void BookmarkNodeChanged(BookmarkModel* model, BookmarkNode* node) {
     ModelChanged();
   }
 
   virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                          BookmarkNode* node) {}
 
+  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                             BookmarkNode* node) {
+    ModelChanged();
+  }
+
   void ModelChanged() {
     window_->Close();
   }
 
   Profile* profile_;
   BookmarkModel* model_;
   // If is_new is true, this is the parent to create the new node under.
   // Otherwise this is the node to change the title of.
   BookmarkNode* node_;
 
@@ skipping 105 matching lines @@
       configuration == BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER) {
     menu_->AppendSeparator();
     menu_->AppendMenuItemWithLabel(
         IDS_CUT, l10n_util::GetString(IDS_CUT));
     menu_->AppendMenuItemWithLabel(
         IDS_COPY, l10n_util::GetString(IDS_COPY));
     menu_->AppendMenuItemWithLabel(
         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(
       IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK,
       l10n_util::GetString(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
   menu_->AppendMenuItemWithLabel(
       IDS_BOOMARK_BAR_NEW_FOLDER,
       l10n_util::GetString(IDS_BOOMARK_BAR_NEW_FOLDER));
 
   if (configuration == BOOKMARK_BAR) {
@@ skipping 127 matching lines @@
 
       if (BookmarkManagerView::current())
         BookmarkManagerView::current()->SelectInTree(selection_[0]);
       break;
 
     case IDS_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
       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(),
                                       selection_, id == IDS_CUT);
       break;
 
     case IDS_PASTE: {
       // Always paste to parent.
       if (!parent_)
         return;
@@ skipping 37 matching lines @@
       return selection_.size() == 1 && !is_root_node;
 
     case IDS_BOOKMARK_BAR_REMOVE:
       return !selection_.empty() && !is_root_node;
 
     case IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER:
       return (configuration_ == BOOKMARK_MANAGER_TABLE_OTHER ||
               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;
 
     case IDS_COPY:
     case IDS_CUT:
       return selection_.size() > 0 && !is_root_node;
 
     case IDS_PASTE:
       // Always paste to parent.
@@ skipping 25 matching lines @@
                                               int index,
                                               BookmarkNode* node) {
   ModelChanged();
 }
 
 void BookmarkContextMenu::BookmarkNodeChanged(BookmarkModel* model,
                                               BookmarkNode* node) {
   ModelChanged();
 }
 
+void BookmarkContextMenu::BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                                        BookmarkNode* node) {
+  ModelChanged();
+}
+
 void BookmarkContextMenu::ModelChanged() {
   menu_->Cancel();
 }
 
 BookmarkModel* BookmarkContextMenu::RemoveModelObserver() {
   BookmarkModel* model = model_;
   model_->RemoveObserver(this);
   model_ = NULL;
   return model;
 }
 
 bool BookmarkContextMenu::HasURLs() const {
   for (size_t i = 0; i < selection_.size(); ++i) {
     if (NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }
 
 BookmarkNode* BookmarkContextMenu::GetParentForNewNodes() const {
   return (selection_.size() == 1 && selection_[0]->is_folder()) ?
       selection_[0] : parent_;
 }