Supporting undoing bookmark deletion without creating new ID.

components/bookmarks/browser/bookmark_model.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <stdint.h>
 #include <map>
 #include <set>
@@ skipping 50 matching lines @@
 //
 // You should NOT directly create a BookmarkModel, instead go through the
 // BookmarkModelFactory.
 class BookmarkModel : public KeyedService {
  public:
   struct URLAndTitle {
     GURL url;
     base::string16 title;
   };
 
+  class UndoDelegate {

[sky, 2015/10/07 16:30:15]

Move into it's own header (see chromium specific style guide for details) and
make destructor protected and virtual.

[jianli, 2015/10/07 23:26:55]

Done.

+   public:
+    // Called when a bookmark node was deleted. The delegate takes the ownership
+    // of the deleted node.
+    //
+    // |parent_node_id| the id of the parent of the node that will be removed.
+    // |index| the index of the node about to be removed in |parent|.
+    // |node| is the node to be deleted.
+    virtual void OnBookmarkNodeDeleted(BookmarkModel* model,
+                                       int64_t parent_node_id,

[sky, 2015/10/07 16:30:15]

I would rather supply the BoomarkNode as the parent. If the delegate wants to
track the id, it can.

[jianli, 2015/10/07 23:26:55]

Done.

+                                       int index,
+                                       BookmarkNode* node) = 0;

[sky, 2015/10/07 16:30:15]

Use scoped_ptr to clarify ownership.

[jianli, 2015/10/07 23:26:55]

Done.

+  };
+
   explicit BookmarkModel(BookmarkClient* client);
   ~BookmarkModel() override;
 
   // KeyedService:
   void Shutdown() override;
 
   // Loads the bookmarks. This is called upon creation of the
   // BookmarkModel. You need not invoke this directly.
   // All load operations will be executed on |io_task_runner| and the completion
   // callback will be called from |ui_task_runner|.
@@ skipping 132 matching lines @@
 
   // Adds a url with a specific creation date and meta info.
   const BookmarkNode* AddURLWithCreationTimeAndMetaInfo(
       const BookmarkNode* parent,
       int index,
       const base::string16& title,
       const GURL& url,
       const base::Time& creation_time,
       const BookmarkNode::MetaInfoMap* meta_info);
 
+  // Adds the |node| at |parent| in the specified |index| and notifies its
+  // observers.
+  BookmarkNode* AddNode(BookmarkNode* parent,

[sky, 2015/10/07 16:30:15]

I don't want this to be public. Expose an interface specifically for the
UndoDelegate that BookmarkModel implements.

[jianli, 2015/10/07 23:26:56]

Done.

+                        int index,
+                        BookmarkNode* node);
+
   // Sorts the children of |parent|, notifying observers by way of the
   // BookmarkNodeChildrenReordered method.
   void SortChildren(const BookmarkNode* parent);
 
   // Order the children of |parent| as specified in |ordered_nodes|.  This
   // function should only be used to reorder the child nodes of |parent| and
   // is not meant to move nodes between different parent. Notifies observers
   // using the BookmarkNodeChildrenReordered method.
   void ReorderChildren(const BookmarkNode* parent,
                        const std::vector<const BookmarkNode*>& ordered_nodes);
@@ skipping 68 matching lines @@
   // http://www.google.com) and the given icon URL (e.g.
   // http://www.google.com/favicon.ico) have changed. It is valid to call
   // OnFaviconsChanged() with non-empty |page_urls| and an empty |icon_url| and
   // vice versa.
   void OnFaviconsChanged(const std::set<GURL>& page_urls,
                          const GURL& icon_url);
 
   // Returns the client used by this BookmarkModel.
   BookmarkClient* client() const { return client_; }
 
+  void set_undo_delegate(UndoDelegate* undo_delegate) {
+    undo_delegate_ = undo_delegate;
+  }
+
  private:
   friend class BookmarkCodecTest;
   friend class BookmarkModelFaviconTest;
   friend class BookmarkStorage;
   friend class ScopedGroupBookmarkActions;
   friend class TestBookmarkClient;
 
   // Used to order BookmarkNodes by URL.
   class NodeURLComparator {
    public:
@@ skipping 26 matching lines @@
   void RemoveNodeAndGetRemovedUrls(BookmarkNode* node,
                                    std::set<GURL>* removed_urls);
 
   // Removes the node from its parent, sends notification, and deletes it.
   // type specifies how the node should be removed.
   void RemoveAndDeleteNode(BookmarkNode* delete_me);
 
   // Remove |node| from |nodes_ordered_by_url_set_| and |index_|.
   void RemoveNodeFromInternalMaps(BookmarkNode* node);
 
-  // Adds the |node| at |parent| in the specified |index| and notifies its
-  // observers.
-  BookmarkNode* AddNode(BookmarkNode* parent,
-                        int index,
-                        BookmarkNode* node);
-
   // Adds the |node| to |nodes_ordered_by_url_set_| and |index_|.
   void AddNodeToInternalMaps(BookmarkNode* node);
 
   // Returns true if the parent and index are valid.
   bool IsValidIndex(const BookmarkNode* parent, int index, bool allow_end);
 
   // Creates one of the possible permanent nodes (bookmark bar node, other node
   // and mobile node) from |type|.
   BookmarkPermanentNode* CreatePermanentNode(BookmarkNode::Type type);
 
@@ skipping 69 matching lines @@
 
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   std::set<std::string> non_cloned_keys_;
 
+  UndoDelegate* undo_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_