Support undoing offline page deletion

components/offline_pages/offline_page_model.h

 // Copyright 2015 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_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 117 matching lines @@
   void SavePage(const GURL& url,
                 int64 bookmark_id,
                 scoped_ptr<OfflinePageArchiver> archiver,
                 const SavePageCallback& callback);
 
   // Marks that the offline page related to the passed |bookmark_id| has been
   // accessed. Its access info, including last access time and access count,
   // will be updated. Requires that the model is loaded.
   void MarkPageAccessed(int64 bookmark_id);
 
+  // Marks that the offline page related to the passed |bookmark_id| was going
+  // to be deleted. The deletion will occur in a short while. The undo can be
+  // done before this. Requires that the model is loaded.
+  void MarkPageForDeletion(int64 bookmark_id,
+                           const DeletePageCallback& callback);
+
   // Deletes an offline page related to the passed |bookmark_id|. Requires that
   // the model is loaded.
   void DeletePageByBookmarkId(int64 bookmark_id,
                               const DeletePageCallback& callback);
 
   // Deletes offline pages related to the passed |bookmark_ids|. Requires that
   // the model is loaded.
   void DeletePagesByBookmarkId(const std::vector<int64>& bookmark_ids,
                                const DeletePageCallback& callback);
 
+  void UndeletePage(int64 bookmark_id,
+                    const DeletePageCallback& callback);
+
   // Gets all available offline pages. Requires that the model is loaded.
   const std::vector<OfflinePageItem> GetAllPages() const;
 
   // Gets pages that should be removed to clean up storage. Requires that the
   // model is loaded.
   const std::vector<OfflinePageItem> GetPagesToCleanUp() const;
 
   // Returns an offline page associated with a specified |bookmark_id|. nullptr
   // is returned if not found.
   const OfflinePageItem* GetPageByBookmarkId(int64 bookmark_id) const;
@@ skipping 10 matching lines @@
  private:
   typedef ScopedVector<OfflinePageArchiver> PendingArchivers;
 
   // BaseBookmarkModelObserver:
   void BookmarkModelChanged() override;
   void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
                            const bookmarks::BookmarkNode* parent,
                            int old_index,
                            const bookmarks::BookmarkNode* node,
                            const std::set<GURL>& removed_urls) override;
+  void BookmarkNodeRenumbered(bookmarks::BookmarkModel* model,
+                              int64 old_bookmark_id,

[fgorski, 2015/09/25 21:23:57]

fix types of bookmark_id to int64_t

[jianli, 2015/10/09 23:26:26]

This is not longer needed.

+                              int64 new_bookmark_id) override;
 
   // Callback for loading pages from the offline page metadata store.
   void OnLoadDone(bool success,
                   const std::vector<OfflinePageItem>& offline_pages);
 
   // Steps for saving a page offline.
   void OnCreateArchiveDone(const GURL& requested_url,
                            int64 bookmark_id,
                            const SavePageCallback& callback,
                            OfflinePageArchiver* archiver,
@@ skipping 13 matching lines @@
   void OnDeleteArchiveFilesDone(
       const std::vector<int64>& bookmark_ids,
       const DeletePageCallback& callback,
       const bool* success);
   void OnRemoveOfflinePagesDone(const std::vector<int64>& bookmark_ids,
                                 const DeletePageCallback& callback,
                                 bool success);
   void InformDeletePageDone(const DeletePageCallback& callback,
                             DeletePageResult result);
 
-  void OnUpdateOfflinePageDone(const OfflinePageItem& offline_page_item,
-                               bool success);
+  void OnMarkPageAccesseDone(const OfflinePageItem& offline_page_item,
+                             bool success);
+
+  void OnMarkPageForDeletionDone(const OfflinePageItem& offline_page_item,
+                                 const DeletePageCallback& callback,
+                                 bool success);
+  void OnUndoOfflinePageDone(const OfflinePageItem& offline_page,
+                             int64 old_bookmark_id,
+                             bool success);
+  void FinalizePageDeletion();
 
   // Persistent store for offline page metadata.
   scoped_ptr<OfflinePageMetadataStore> store_;
 
   // The observers.
   base::ObserverList<Observer> observers_;
 
   bool is_loaded_;
 
   // In memory copy of the offline page metadata, keyed by bookmark IDs.
@@ skipping 11 matching lines @@
       scoped_observer_;
 
   base::WeakPtrFactory<OfflinePageModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModel);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_