When we create a new folder in the BookmarkEditor, it is useful to be able to...

chrome/browser/views/bookmark_editor_view.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/views/bookmark_editor_view.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 185 matching lines @@
   return (command_id != IDS_EDIT || !running_menu_for_root_);
 }
 
 bool BookmarkEditorView::GetAcceleratorForCommandId(
     int command_id,
     views::Accelerator* accelerator) {
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 void BookmarkEditorView::ExecuteCommand(int command_id) {
-  DCHECK(tree_view_->GetSelectedNode());
+  TreeModelNode* selected_node = tree_view_->GetSelectedNode();
+  DCHECK(selected_node);
   if (command_id == IDS_EDIT) {
-    tree_view_->StartEditing(tree_view_->GetSelectedNode());
+    tree_view_->StartEditing(selected_node);
+  } else if (command_id == IDS_DELETE) {
+    // We can only delete newly created folders. Remove the node from the
+    // TreeModel.
+    ApplyDelete(selected_node);
   } else {
     DCHECK(command_id == IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
     NewGroup();
   }
 }
 
 void BookmarkEditorView::Show(HWND parent_hwnd) {
   views::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(), this);
   UserInputChanged();
   if (show_tree_ && bb_model_->IsLoaded())
     ExpandAndSelect();
   window()->Show();
   // Select all the text in the name Textfield.
   title_tf_.SelectAll();
   // Give focus to the name Textfield.
   title_tf_.RequestFocus();
 }
 
 void BookmarkEditorView::Close() {
   DCHECK(window());
   window()->Close();
 }
 
 void BookmarkEditorView::ShowContextMenu(View* source,
                                          int x,
                                          int y,
                                          bool is_mouse_gesture) {
   DCHECK(source == tree_view_);
-  if (!tree_view_->GetSelectedNode())
+  TreeModelNode* selected_node = tree_view_->GetSelectedNode();
+  if (!selected_node)
     return;
   running_menu_for_root_ =
-      (tree_model_->GetParent(tree_view_->GetSelectedNode()) ==
-       tree_model_->GetRoot());
-  if (!context_menu_contents_.get()) {
+      (tree_model_->GetParent(selected_node) == tree_model_->GetRoot());
+
+  EditorNode* node = tree_model_->AsNode(selected_node);
+
+  bool reload_menu_contents = false;
+  if (context_menu_contents_.get()) {
+    bool has_delete_in_menu =
+      context_menu_contents_->GetCommandIdAt(1) == IDS_DELETE;
+
+    // Only show delete option for new groups.
+    reload_menu_contents = (node->value == 0) ^ has_delete_in_menu;
+  }
+
+  if (!context_menu_contents_.get() || reload_menu_contents) {
     context_menu_contents_.reset(new views::SimpleMenuModel(this));
     context_menu_contents_->AddItemWithStringId(IDS_EDIT, IDS_EDIT);
+    // If this is a newly created folder that has not been added to the
+    // BookmarkModel, a user may delete the folder.
+    if (node->value == 0)
+      context_menu_contents_->AddItemWithStringId(IDS_DELETE, IDS_DELETE);
     context_menu_contents_->AddItemWithStringId(
         IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
         IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
     context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
   }
   context_menu_->RunContextMenuAt(gfx::Point(x, y));
 }
 
 void BookmarkEditorView::Init() {
   bb_model_ = profile_->GetBookmarkModel();
@@ skipping 228 matching lines @@
   if (node->value == id)
     return node;
   for (int i = 0; i < node->GetChildCount(); ++i) {
     EditorNode* result = FindNodeWithID(node->GetChild(i), id);
     if (result)
       return result;
   }
   return NULL;
 }
 
+void BookmarkEditorView::ApplyDelete(TreeModelNode* node) {
+  EditorNode* deleted_node = show_tree_ ?
+      tree_model_->AsNode(node) : NULL;
+
+  if (show_tree_ && !deleted_node) {
+    NOTREACHED();
+    return;
+  }
+
+  EditorNode* parent = deleted_node ? deleted_node->GetParent() : NULL;
+  const int index = parent ? parent->IndexOfChild(deleted_node) : -1;
+
+  if (index == -1) {
+    NOTREACHED();
+    return;
+  }
+
+  tree_model_->Remove(parent, index);
+}
+
 void BookmarkEditorView::ApplyEdits() {
   DCHECK(bb_model_->IsLoaded());
 
   EditorNode* parent = show_tree_ ?
       tree_model_->AsNode(tree_view_->GetSelectedNode()) : NULL;
   if (show_tree_ && !parent) {
     NOTREACHED();
     return;
   }
   ApplyEdits(parent);
@@ skipping 49 matching lines @@
           break;
         }
       }
       DCHECK(child_bb_node);
       bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
     }
     ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
                                        parent_b_node, parent_bb_node);
   }
 }